Merge lp:~james-page/charms/trusty/nova-compute/lp1531102-trunk into lp:~openstack-charmers-archive/charms/trusty/nova-compute/trunk

[James Page]

Resync helpers

Resync stable helpers to resolve liberty point release issues.

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #16736 nova-compute for james-page mp281866
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/16736/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #15638 nova-compute for james-page mp281866
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/15638/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #8564 nova-compute for james-page mp281866
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/8564/

[Liam Young (gnuoy)]

approve

review: Approve

=== modified file 'hooks/charmhelpers/contrib/openstack/utils.py'
--- hooks/charmhelpers/contrib/openstack/utils.py	2015-10-22 15:11:10 +0000
+++ hooks/charmhelpers/contrib/openstack/utils.py	2016-01-07 14:23:06 +0000
@@ -127,31 +127,31 @@
 # >= Liberty version->codename mapping
 PACKAGE_CODENAMES = {
     'nova-common': OrderedDict([
-        ('12.0.0', 'liberty'),
+        ('12.0', 'liberty'),
     ]),
     'neutron-common': OrderedDict([
-        ('7.0.0', 'liberty'),
+        ('7.0', 'liberty'),
     ]),
     'cinder-common': OrderedDict([
-        ('7.0.0', 'liberty'),
+        ('7.0', 'liberty'),
     ]),
     'keystone': OrderedDict([
-        ('8.0.0', 'liberty'),
+        ('8.0', 'liberty'),
     ]),
     'horizon-common': OrderedDict([
-        ('8.0.0', 'liberty'),
+        ('8.0', 'liberty'),
     ]),
     'ceilometer-common': OrderedDict([
-        ('5.0.0', 'liberty'),
+        ('5.0', 'liberty'),
     ]),
     'heat-common': OrderedDict([
-        ('5.0.0', 'liberty'),
+        ('5.0', 'liberty'),
     ]),
     'glance-common': OrderedDict([
-        ('11.0.0', 'liberty'),
+        ('11.0', 'liberty'),
     ]),
     'openstack-dashboard': OrderedDict([
-        ('8.0.0', 'liberty'),
+        ('8.0', 'liberty'),
     ]),
 }
 
@@ -238,7 +238,14 @@
         error_out(e)
 
     vers = apt.upstream_version(pkg.current_ver.ver_str)
-    match = re.match('^(\d+)\.(\d+)\.(\d+)', vers)
+    if 'swift' in pkg.name:
+        # Fully x.y.z match for swift versions
+        match = re.match('^(\d+)\.(\d+)\.(\d+)', vers)
+    else:
+        # x.y match only for 20XX.X
+        # and ignore patch level for other packages
+        match = re.match('^(\d+)\.(\d+)', vers)
+
     if match:
         vers = match.group(0)
 
@@ -250,13 +257,8 @@
         # < Liberty co-ordinated project versions
         try:
             if 'swift' in pkg.name:
-                swift_vers = vers[:5]
-                if swift_vers not in SWIFT_CODENAMES:
-                    # Deal with 1.10.0 upward
-                    swift_vers = vers[:6]
-                return SWIFT_CODENAMES[swift_vers]
+                return SWIFT_CODENAMES[vers]
             else:
-                vers = vers[:6]
                 return OPENSTACK_CODENAMES[vers]
         except KeyError:
             if not fatal: