Merge lp:~james-page/charm-helpers/mitaka into lp:charm-helpers

[James Page]

Updates to support OpenStack Mitaka

[Liam Young (gnuoy)]

Approve

review: Approve

=== modified file 'charmhelpers/contrib/openstack/utils.py'
--- charmhelpers/contrib/openstack/utils.py	2015-11-03 10:44:18 +0000
+++ charmhelpers/contrib/openstack/utils.py	2015-12-14 14:32:58 +0000
@@ -86,6 +86,7 @@
     ('utopic', 'juno'),
     ('vivid', 'kilo'),
     ('wily', 'liberty'),
+    ('xenial', 'mitaka'),
 ])
 
 
@@ -99,6 +100,7 @@
     ('2014.2', 'juno'),
     ('2015.1', 'kilo'),
     ('2015.2', 'liberty'),
+    ('2016.1', 'mitaka'),
 ])
 
 # The ugly duckling
@@ -130,30 +132,39 @@
 PACKAGE_CODENAMES = {
     'nova-common': OrderedDict([
         ('12.0.0', 'liberty'),
+        ('13.0.0', 'mitaka'),
     ]),
     'neutron-common': OrderedDict([
         ('7.0.0', 'liberty'),
+        ('8.0.0', 'mitaka'),
     ]),
     'cinder-common': OrderedDict([
         ('7.0.0', 'liberty'),
+        ('8.0.0', 'mitaka'),
     ]),
     'keystone': OrderedDict([
         ('8.0.0', 'liberty'),
+        ('9.0.0', 'mitaka'),
     ]),
     'horizon-common': OrderedDict([
         ('8.0.0', 'liberty'),
+        ('9.0.0', 'mitaka'),
     ]),
     'ceilometer-common': OrderedDict([
         ('5.0.0', 'liberty'),
+        ('6.0.0', 'mitaka'),
     ]),
     'heat-common': OrderedDict([
         ('5.0.0', 'liberty'),
+        ('6.0.0', 'mitaka'),
     ]),
     'glance-common': OrderedDict([
         ('11.0.0', 'liberty'),
+        ('12.0.0', 'mitaka'),
     ]),
     'openstack-dashboard': OrderedDict([
         ('8.0.0', 'liberty'),
+        ('9.0.0', 'mitaka'),
     ]),
 }
 
@@ -377,6 +388,9 @@
             'liberty': 'trusty-updates/liberty',
             'liberty/updates': 'trusty-updates/liberty',
             'liberty/proposed': 'trusty-proposed/liberty',
+            'mitaka': 'trusty-updates/mitaka',
+            'mitaka/updates': 'trusty-updates/mitaka',
+            'mitaka/proposed': 'trusty-proposed/mitaka',
         }
 
         try:
 
=== modified file 'charmhelpers/fetch/__init__.py'
--- charmhelpers/fetch/__init__.py	2015-12-09 23:06:09 +0000
+++ charmhelpers/fetch/__init__.py	2015-12-14 14:32:58 +0000
@@ -98,6 +98,14 @@
     'liberty/proposed': 'trusty-proposed/liberty',
     'trusty-liberty/proposed': 'trusty-proposed/liberty',
     'trusty-proposed/liberty': 'trusty-proposed/liberty',
+    # Mitaka
+    'mitaka': 'trusty-updates/mitaka',
+    'trusty-mitaka': 'trusty-updates/mitaka',
+    'trusty-mitaka/updates': 'trusty-updates/mitaka',
+    'trusty-updates/mitaka': 'trusty-updates/mitaka',
+    'mitaka/proposed': 'trusty-proposed/mitaka',
+    'trusty-mitaka/proposed': 'trusty-proposed/mitaka',
+    'trusty-proposed/mitaka': 'trusty-proposed/mitaka',
 }
 
 # The order of this list is very important. Handlers should be listed in from
 
=== modified file 'tests/contrib/openstack/test_openstack_utils.py'
--- tests/contrib/openstack/test_openstack_utils.py	2015-09-21 18:50:08 +0000
+++ tests/contrib/openstack/test_openstack_utils.py	2015-12-14 14:32:58 +0000
@@ -73,7 +73,7 @@
     },
     # poorly formed openstack version
     'bad-version': {
-        'pkg_vers': '1:2016.1-0ubuntu1.1~cloud0',
+        'pkg_vers': '1:2200.1-0ubuntu1.1~cloud0',
         'os_release': None,
         'os_version': None
     }
@@ -264,7 +264,7 @@
         with patch('apt_pkg.Cache') as cache:
             cache.return_value = self._apt_cache()
             openstack.get_os_codename_package('bad-version')
-            _e = ('Could not determine OpenStack codename for version 2016.1')
+            _e = ('Could not determine OpenStack codename for version 2200.1')
             mocked_error.assert_called_with(_e)
 
     @patch('charmhelpers.contrib.openstack.utils.error_out')