Merge lp:~corey.bryant/charms/precise/nova-cloud-controller/step-migration into lp:~openstack-charmers/charms/precise/nova-cloud-controller/icehouse

[Corey Bryant]

[James Page (james-page)]

Comments:

1) + return ''

return None would be nicer - passing empty strings always feels bad to me - to be explicit the check of the return value should be in this case:

  if step_src is not None:

2) Don't return in the stepped upgrade.

do_openstack_upgrade is currently returning on the interim step as well; not good :-).

review: Needs Fixing

[Corey Bryant (corey.bryant)]

> Comments:
>
> 1) + return ''
>
> return None would be nicer - passing empty strings always feels bad to me - to
> be explicit the check of the return value should be in this case:
>
> if step_src is not None:
>

Sounds good.

> 2) Don't return in the stepped upgrade.
>
> do_openstack_upgrade is currently returning on the interim step as well; not
> good :-).

Oops, yeah that's a mistake.

[lp:~corey.bryant/charms/precise/nova-cloud-controller/step-migration]

102. By Corey Bryant on 2014-04-08

Enable upgrade from grizzly to icehouse by stepping to havana

[Corey Bryant (corey.bryant)]

Fixes have been added in response to James' comments. Thanks for reviewing!

=== modified file 'hooks/nova_cc_utils.py'
--- hooks/nova_cc_utils.py	2014-04-01 15:40:28 +0000
+++ hooks/nova_cc_utils.py	2014-04-08 13:01:32 +0000
@@ -307,11 +307,31 @@
     _save_script_rc(**env_vars)
 
 
-def do_openstack_upgrade():
-    # NOTE(jamespage) horrible hack to make utils forget a cached value
-    import charmhelpers.contrib.openstack.utils as utils
-    utils.os_rel = None
-    new_src = config('openstack-origin')
+def get_step_upgrade_source(new_src):
+    '''
+    Determine if upgrade skips a release and, if so, return source
+    of skipped release.
+    '''
+    sources = {
+        #target_src: (cur_pocket, step_src)
+        'cloud:precise-icehouse':
+            ('precise-updates/grizzly', 'cloud:precise-havana'),
+        'cloud:precise-icehouse/proposed':
+            ('precise-proposed/grizzly', 'cloud:precise-havana/proposed')
+    }
+
+    with open('/etc/apt/sources.list.d/cloud-archive.list', 'r') as f:
+        line = f.readline()
+        for target_src, (cur_pocket, step_src) in sources.items():
+            if target_src != new_src:
+                continue
+            if cur_pocket in line:
+                return step_src
+
+    return None
+
+
+def _do_openstack_upgrade(new_src):
     new_os_rel = get_os_codename_install_source(new_src)
     log('Performing OpenStack upgrade to %s.' % (new_os_rel))
 
@@ -336,6 +356,19 @@
     return configs
 
 
+def do_openstack_upgrade():
+    # NOTE(jamespage) horrible hack to make utils forget a cached value
+    import charmhelpers.contrib.openstack.utils as utils
+    utils.os_rel = None
+    new_src = config('openstack-origin')
+
+    step_src = get_step_upgrade_source(new_src)
+    if step_src is not None:
+        _do_openstack_upgrade(step_src)
+
+    return _do_openstack_upgrade(new_src)
+
+
 def volume_service():
     '''Specifies correct volume API for specific OS release'''
     os_vers = os_release('nova-common')