Merge lp:~thedac/openstack-mojo-specs/17.02-stable-to-next into lp:openstack-mojo-specs

[David Ames]

17.02 Release changes for Stable to Next

[Ryan Beisner (1chb1n)]

Please `make lint`:

(!) specs/full_stack/stable_to_next_ha/mitaka
WARNING:root:git_checkout_stable.py is not referenced by the manifest. Can this file be removed?

(!) specs/full_stack/stable_to_next_ha/liberty
WARNING:root:collect-next-ha-trusty is not referenced by the manifest. Can this file be removed?
WARNING:root:collect-stable-ha-trusty is not referenced by the manifest. Can this file be removed?

(!) specs/full_stack/stable_to_next_ha/newton
WARNING:root:git_checkout_stable.py is not referenced by the manifest. Can this file be removed?

review: Needs Fixing

[lp:~thedac/openstack-mojo-specs/17.02-stable-to-next]

300. By David Ames on 2017-02-21

Lint fixes

=== modified file 'helper/bundles/ha.yaml'
--- helper/bundles/ha.yaml	2017-02-10 11:39:34 +0000
+++ helper/bundles/ha.yaml	2017-02-21 18:47:55 +0000
@@ -70,7 +70,6 @@
       num_units: 3
       options:
         network-manager: Neutron
-        quantum-security-groups: "yes"
         vip: 10.5.100.4
     nova-cc-hacluster:
       charm: hacluster
@@ -82,6 +81,7 @@
       constraints: mem=4G
       options:
         instance-mtu: 1300
+        bridge-mappings: physnet1:br-ex
     cinder:
       charm: cinder
       constraints: mem=1G
@@ -272,12 +272,19 @@
     source: proposed
     openstack-origin: distro-proposed
 # ocata
-xenial-ocata:
+xenial-newton-ha:
+  inherits: openstack-services
+  series: xenial
+  overrides:
+    openstack-origin: cloud:xenial-newton
+    source: cloud:xenial-newton
+# ocata
+xenial-ocata-ha:
   inherits: openstack-services
   series: xenial
   overrides:
     openstack-origin: cloud:xenial-ocata
     source: cloud:xenial-ocata
-zesty-ocata:
+zesty-ocata-ha:
   inherits: openstack-services
   series: zesty

=== added file 'helper/collect/collect-stable-ha'
--- helper/collect/collect-stable-ha	1970-01-01 00:00:00 +0000
+++ helper/collect/collect-stable-ha	2017-02-21 18:47:55 +0000
@@ -0,0 +1,22 @@
+ceilometer-agent       cs:~openstack-charmers/ceilometer-agent
+ceilometer             cs:~openstack-charmers/ceilometer
+ceph                   cs:~openstack-charmers/ceph
+ceph-osd               cs:~openstack-charmers/ceph-osd
+cinder-ceph            cs:~openstack-charmers/cinder-ceph
+cinder                 cs:~openstack-charmers/cinder
+glance                 cs:~openstack-charmers/glance
+hacluster              cs:~openstack-charmers/hacluster
+heat                   cs:~openstack-charmers/heat
+keystone               cs:~openstack-charmers/keystone
+mongodb                cs:trusty/mongodb
+neutron-api            cs:~openstack-charmers/neutron-api
+neutron-gateway        cs:~openstack-charmers/neutron-gateway
+neutron-openvswitch    cs:~openstack-charmers/neutron-openvswitch
+nova-cloud-controller  cs:~openstack-charmers/nova-cloud-controller
+nova-compute           cs:~openstack-charmers/nova-compute
+ntp                    cs:trusty/ntp
+openstack-dashboard    cs:~openstack-charmers/openstack-dashboard
+percona-cluster        cs:~openstack-charmers/percona-cluster
+rabbitmq-server        cs:~openstack-charmers/rabbitmq-server
+swift-proxy            cs:~openstack-charmers/swift-proxy
+swift-storage          cs:~openstack-charmers/swift-storage

=== added symlink 'specs/full_stack/stable_to_next_ha/liberty/collect-next-ha'
=== target is u'../../../../helper/collect/collect-next-ha'
=== removed symlink 'specs/full_stack/stable_to_next_ha/liberty/collect-next-ha-trusty'
=== target was u'../../../../helper/collect/collect-next-ha'
=== added symlink 'specs/full_stack/stable_to_next_ha/liberty/collect-stable-ha'
=== target is u'../../../../helper/collect/collect-stable-ha'
=== removed symlink 'specs/full_stack/stable_to_next_ha/liberty/collect-stable-ha-trusty'
=== target was u'../../../../helper/collect/collect-stable-ha-trusty'
=== removed symlink 'specs/full_stack/stable_to_next_ha/liberty/git_checkout_stable.py'
=== target was u'../../../../helper/setup/git_checkout_stable.py'
=== modified file 'specs/full_stack/stable_to_next_ha/liberty/manifest'
--- specs/full_stack/stable_to_next_ha/liberty/manifest	2016-04-15 19:17:00 +0000
+++ specs/full_stack/stable_to_next_ha/liberty/manifest	2017-02-21 18:47:55 +0000
@@ -1,8 +1,5 @@
 # Collect the charm branches from Launchpad
-collect config=collect-stable-ha-${MOJO_SERIES}
-
-# Checkout stable
-script config=git_checkout_stable.py
+collect config=collect-stable-ha
 
 # Use juju deployer to add the relations for the deployment
 deploy config=ha.yaml delay=0 wait=True target=${MOJO_SERIES}-liberty-ha
@@ -29,7 +26,7 @@
 script config=wipe_charm_dir.py
 
 # Collect the next (devel) charm branches from Launchpad
-collect config=collect-next-ha-${MOJO_SERIES}
+collect config=collect-next-ha
 
 # Run upgrade-charm on all services
 script config=upgrade_all_services.py

=== added directory 'specs/full_stack/stable_to_next_ha/mitaka'
=== added file 'specs/full_stack/stable_to_next_ha/mitaka/SPEC_INFO.txt'
--- specs/full_stack/stable_to_next_ha/mitaka/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_to_next_ha/mitaka/SPEC_INFO.txt	2017-02-21 18:47:55 +0000
@@ -0,0 +1,2 @@
+This spec performs a phased ha deploy using the stable charms then upgrades
+charms to the next branches then runs tests to validate the deployment

=== added symlink 'specs/full_stack/stable_to_next_ha/mitaka/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/mitaka/collect-next-ha'
=== target is u'../../../../helper/collect/collect-next-ha'
=== added symlink 'specs/full_stack/stable_to_next_ha/mitaka/collect-stable-ha'
=== target is u'../../../../helper/collect/collect-stable-ha'
=== added symlink 'specs/full_stack/stable_to_next_ha/mitaka/ha.yaml'
=== target is u'../../../../helper/bundles/ha.yaml'
=== added symlink 'specs/full_stack/stable_to_next_ha/mitaka/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/mitaka/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/stable_to_next_ha/mitaka/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/mitaka/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/stable_to_next_ha/mitaka/manifest'
--- specs/full_stack/stable_to_next_ha/mitaka/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_to_next_ha/mitaka/manifest	2017-02-21 18:47:55 +0000
@@ -0,0 +1,43 @@
+# Collect the charm branches from Launchpad
+collect config=collect-stable-ha
+
+# Use juju deployer to add the relations for the deployment
+deploy config=ha.yaml delay=0 wait=True target=${MOJO_SERIES}-mitaka-ha
+
+# Check juju statuses are green and that hooks have finished
+#verify config=check_juju.py
+
+# Create sdn on overcloud
+script config=network_setup.py
+
+# Setup glance images
+script config=image_setup.py
+
+# Setup keystone users
+script config=keystone_setup.py
+
+# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
+verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:3' CLOUDINIT_WAIT="300"
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py
+
+# Remove charms directories
+script config=wipe_charm_dir.py
+
+# Collect the next (devel) charm branches from Launchpad
+collect config=collect-next-ha
+
+# Run upgrade-charm on all services
+script config=upgrade_all_services.py
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
+verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:3' CLOUDINIT_WAIT="300"
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py
+
+# Success

=== added symlink 'specs/full_stack/stable_to_next_ha/mitaka/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/stable_to_next_ha/mitaka/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/mitaka/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/mitaka/test_obj_store.py'
=== target is u'../../../../helper/tests/test_obj_store.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/mitaka/upgrade_all_services.py'
=== target is u'../../../../helper/setup/upgrade_all_services.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/mitaka/utils'
=== target is u'../../../../helper/utils'
=== added symlink 'specs/full_stack/stable_to_next_ha/mitaka/wipe_charm_dir.py'
=== target is u'../../../../helper/setup/wipe_charm_dir.py'
=== added directory 'specs/full_stack/stable_to_next_ha/newton'
=== added file 'specs/full_stack/stable_to_next_ha/newton/SPEC_INFO.txt'
--- specs/full_stack/stable_to_next_ha/newton/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_to_next_ha/newton/SPEC_INFO.txt	2017-02-21 18:47:55 +0000
@@ -0,0 +1,2 @@
+This spec performs a phased ha deploy using the stable charms then upgrades
+charms to the next branches then runs tests to validate the deployment

=== added symlink 'specs/full_stack/stable_to_next_ha/newton/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/newton/collect-next-ha'
=== target is u'../../../../helper/collect/collect-next-ha'
=== added symlink 'specs/full_stack/stable_to_next_ha/newton/collect-stable-ha'
=== target is u'../../../../helper/collect/collect-stable-ha'
=== added symlink 'specs/full_stack/stable_to_next_ha/newton/ha.yaml'
=== target is u'../../../../helper/bundles/ha.yaml'
=== added symlink 'specs/full_stack/stable_to_next_ha/newton/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/newton/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/stable_to_next_ha/newton/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/newton/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/stable_to_next_ha/newton/manifest'
--- specs/full_stack/stable_to_next_ha/newton/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_to_next_ha/newton/manifest	2017-02-21 18:47:55 +0000
@@ -0,0 +1,43 @@
+# Collect the charm branches from Launchpad
+collect config=collect-stable-ha
+
+# Use juju deployer to add the relations for the deployment
+deploy config=ha.yaml delay=0 wait=True target=${MOJO_SERIES}-newton-ha
+
+# Check juju statuses are green and that hooks have finished
+#verify config=check_juju.py
+
+# Create sdn on overcloud
+script config=network_setup.py
+
+# Setup glance images
+script config=image_setup.py
+
+# Setup keystone users
+script config=keystone_setup.py
+
+# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
+verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:3' CLOUDINIT_WAIT="300"
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py
+
+# Remove charms directories
+script config=wipe_charm_dir.py
+
+# Collect the next (devel) charm branches from Launchpad
+collect config=collect-next-ha
+
+# Run upgrade-charm on all services
+script config=upgrade_all_services.py
+
+# Check juju statuses are green and that hooks have finished
+verify config=check_juju.py
+
+# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
+verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:3' CLOUDINIT_WAIT="300"
+
+# Test obj store by sending and recieving files
+verify config=test_obj_store.py
+
+# Success

=== added symlink 'specs/full_stack/stable_to_next_ha/newton/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/stable_to_next_ha/newton/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/newton/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/newton/test_obj_store.py'
=== target is u'../../../../helper/tests/test_obj_store.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/newton/upgrade_all_services.py'
=== target is u'../../../../helper/setup/upgrade_all_services.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/newton/utils'
=== target is u'../../../../helper/utils'
=== added symlink 'specs/full_stack/stable_to_next_ha/newton/wipe_charm_dir.py'
=== target is u'../../../../helper/setup/wipe_charm_dir.py'