Merge lp:~chris.macnaughton/openstack-mojo-specs/ha-upgrade into lp:openstack-mojo-specs

[Chris MacNaughton]

[lp:~chris.macnaughton/openstack-mojo-specs/ha-upgrade]

320. By Chris MacNaughton on 2017-11-29

update specs to grab from cs: proper links

321. By Chris MacNaughton on 2017-11-30

Apply gnuoy's patch to fix uprgade

[Ryan Beisner (1chb1n)]

All: please be sure to `make lint` on all mojo MPs and reviews.

helper/utils/mojo_utils.py:517:10: E111 indentation is not a multiple of four
helper/utils/mojo_utils.py:519:10: E111 indentation is not a multiple of four
checking helper/utils/os_versions.py
Makefile:5: recipe for target 'lint' failed
make: *** [lint] Error 1

review: Needs Fixing

[Ryan Beisner (1chb1n)]

Why are we switching away from the explicit openstack-charmers stable charm namespace?

[Chris MacNaughton (chris.macnaughton)]

Per discussion in IRC, I can undo that change if we'd rather, for reference:

10:47:28 <gnuoy> icey, ok, so lets do what you suggested and just switch the spec to pull from cs:$name and upgrade to cs:openstack-charmers-next/$name
10:47:50 across all targets
10:47:57 <icey> gnuoy: I /think/ I'm ok pulling from cs:openstack-charmers/$name since (I believe) that cs:$name is basically a pointer at that
10:48:12 I'll update the change with that and then run another OSCI spec
10:48:17 <gnuoy> icey, I see no reason to do that
10:48:40 <icey> gnuoy: use the openstack-charmers (not -next) bits?
10:48:56 <gnuoy> Use cs:openstack-charmers/$name rather than cs:$name
10:49:36 I think we should be testing an upgrade from cs:$name to cs:openstack-charmers-next/$name and making no assumption about pointers

[lp:~chris.macnaughton/openstack-mojo-specs/ha-upgrade]

322. By Chris MacNaughton on 2017-11-30

fix spacing

323. By Chris MacNaughton on 2017-11-30

revert to openstack-charmers urls

[Ryan Beisner (1chb1n)]

I think we need to be consistent across the collection files. Historically, and in other spec collect files, we use the explicit charm namespace. If there is a reason to move to cs:foo, let's talk about that and change them all, separately.

[Liam Young (gnuoy)]

LGTM, thanks.

review: Approve

=== modified file 'helper/utils/mojo_utils.py'
--- helper/utils/mojo_utils.py	2017-09-25 21:34:17 +0000
+++ helper/utils/mojo_utils.py	2017-11-30 14:53:10 +0000
@@ -511,8 +511,12 @@
             git_checkout_branch(charm_dir, branch)
 
 
-def upgrade_service(svc, switch=None):
-    charm_dir = os.path.join(get_charm_dir(), svc)
+def upgrade_service(svc, charm_name=None, switch=None):
+    if charm_name and os.path.exists(os.path.join(get_charm_dir(),
+                                                  charm_name)):
+        charm_dir = os.path.join(get_charm_dir(), charm_name)
+    else:
+        charm_dir = os.path.join(get_charm_dir(), svc)
     logging.info('Upgrading ' + svc)
     cmd = [kiki.cmd(), 'upgrade-charm']
     # Switch and path are now mutually exclusive
@@ -531,13 +535,15 @@
                    'keystone']
     for svc in base_charms:
         if svc in juju_status[kiki.applications()]:
-            upgrade_service(svc, switch=switch)
+            charm_name = juju_status['applications'][svc]['charm-name']
+            upgrade_service(svc, charm_name=charm_name, switch=switch)
             time.sleep(30)
     time.sleep(60)
     # Upgrade the rest
     for svc in juju_status[kiki.applications()]:
         if svc not in base_charms:
-            upgrade_service(svc, switch=switch)
+            charm_name = juju_status['applications'][svc]['charm-name']
+            upgrade_service(svc, charm_name=charm_name, switch=switch)
             time.sleep(30)
 
 

=== added symlink 'specs/full_stack/stable_to_next_ha/icehouse/collect-next-ha'
=== target is u'../../../../helper/collect/collect-next-ha'
=== removed symlink 'specs/full_stack/stable_to_next_ha/icehouse/collect-next-ha-trusty'
=== target was u'../../../../helper/collect/collect-next-ha'
=== added symlink 'specs/full_stack/stable_to_next_ha/icehouse/collect-stable-ha'
=== target is u'../../../../helper/collect/collect-stable-ha'
=== removed symlink 'specs/full_stack/stable_to_next_ha/icehouse/collect-stable-ha-trusty'
=== target was u'../../../../helper/collect/collect-stable-ha-trusty'
=== removed symlink 'specs/full_stack/stable_to_next_ha/icehouse/git_checkout_stable.py'
=== target was u'../../../../helper/setup/git_checkout_stable.py'
=== modified file 'specs/full_stack/stable_to_next_ha/icehouse/manifest'
--- specs/full_stack/stable_to_next_ha/icehouse/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/stable_to_next_ha/icehouse/manifest	2017-11-30 14:53:10 +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=False target=${MOJO_SERIES}-icehouse-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 symlink 'specs/full_stack/stable_to_next_ha/kilo/collect-next-ha'
=== target is u'../../../../helper/collect/collect-next-ha'
=== removed symlink 'specs/full_stack/stable_to_next_ha/kilo/collect-next-ha-trusty'
=== target was u'../../../../helper/collect/collect-next-ha'
=== added symlink 'specs/full_stack/stable_to_next_ha/kilo/collect-stable-ha'
=== target is u'../../../../helper/collect/collect-stable-ha'
=== removed symlink 'specs/full_stack/stable_to_next_ha/kilo/collect-stable-ha-trusty'
=== target was u'../../../../helper/collect/collect-stable-ha-trusty'
=== removed symlink 'specs/full_stack/stable_to_next_ha/kilo/git_checkout_stable.py'
=== target was u'../../../../helper/setup/git_checkout_stable.py'
=== modified file 'specs/full_stack/stable_to_next_ha/kilo/manifest'
--- specs/full_stack/stable_to_next_ha/kilo/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/stable_to_next_ha/kilo/manifest	2017-11-30 14:53:10 +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=False target=${MOJO_SERIES}-kilo-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/ocata'
=== added file 'specs/full_stack/stable_to_next_ha/ocata/SPEC_INFO.txt'
--- specs/full_stack/stable_to_next_ha/ocata/SPEC_INFO.txt	1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_to_next_ha/ocata/SPEC_INFO.txt	2017-11-30 14:53:10 +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/ocata/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/ocata/collect-next-ha'
=== target is u'../../../../helper/collect/collect-next-ha'
=== added symlink 'specs/full_stack/stable_to_next_ha/ocata/collect-stable-ha'
=== target is u'../../../../helper/collect/collect-stable-ha'
=== added symlink 'specs/full_stack/stable_to_next_ha/ocata/ha.yaml'
=== target is u'../../../../helper/bundles/ha.yaml'
=== added symlink 'specs/full_stack/stable_to_next_ha/ocata/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/ocata/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/stable_to_next_ha/ocata/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/ocata/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/stable_to_next_ha/ocata/manifest'
--- specs/full_stack/stable_to_next_ha/ocata/manifest	1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_to_next_ha/ocata/manifest	2017-11-30 14:53:10 +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=False target=${MOJO_SERIES}-ocata-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/ocata/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/stable_to_next_ha/ocata/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/ocata/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/ocata/test_obj_store.py'
=== target is u'../../../../helper/tests/test_obj_store.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/ocata/upgrade_all_services.py'
=== target is u'../../../../helper/setup/upgrade_all_services.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/ocata/utils'
=== target is u'../../../../helper/utils'
=== added symlink 'specs/full_stack/stable_to_next_ha/ocata/wipe_charm_dir.py'
=== target is u'../../../../helper/setup/wipe_charm_dir.py'