Charm Helpers

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

  1. mitaka
  2. Merge into devel
Proposed by James Page
Status: Merged
Merged at revision: 508
Proposed branch: lp:~james-page/charm-helpers/mitaka
Merge into: lp:charm-helpers
Diff against target: 110 lines (+24/-2)
3 files modified
charmhelpers/contrib/openstack/utils.py (+14/-0)
charmhelpers/fetch/__init__.py (+8/-0)
tests/contrib/openstack/test_openstack_utils.py (+2/-2)
To merge this branch: bzr merge lp:~james-page/charm-helpers/mitaka
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+280449@code.launchpad.net

Description of the change

Updates to support OpenStack Mitaka

To post a comment you must log in.
Revision history for this message
Liam Young (gnuoy) wrote :

Approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charmhelpers/contrib/openstack/utils.py'
2--- charmhelpers/contrib/openstack/utils.py 2015-11-03 10:44:18 +0000
3+++ charmhelpers/contrib/openstack/utils.py 2015-12-14 14:32:58 +0000
4@@ -86,6 +86,7 @@
5 ('utopic', 'juno'),
6 ('vivid', 'kilo'),
7 ('wily', 'liberty'),
8+ ('xenial', 'mitaka'),
9 ])
10
11
12@@ -99,6 +100,7 @@
13 ('2014.2', 'juno'),
14 ('2015.1', 'kilo'),
15 ('2015.2', 'liberty'),
16+ ('2016.1', 'mitaka'),
17 ])
18
19 # The ugly duckling
20@@ -130,30 +132,39 @@
21 PACKAGE_CODENAMES = {
22 'nova-common': OrderedDict([
23 ('12.0.0', 'liberty'),
24+ ('13.0.0', 'mitaka'),
25 ]),
26 'neutron-common': OrderedDict([
27 ('7.0.0', 'liberty'),
28+ ('8.0.0', 'mitaka'),
29 ]),
30 'cinder-common': OrderedDict([
31 ('7.0.0', 'liberty'),
32+ ('8.0.0', 'mitaka'),
33 ]),
34 'keystone': OrderedDict([
35 ('8.0.0', 'liberty'),
36+ ('9.0.0', 'mitaka'),
37 ]),
38 'horizon-common': OrderedDict([
39 ('8.0.0', 'liberty'),
40+ ('9.0.0', 'mitaka'),
41 ]),
42 'ceilometer-common': OrderedDict([
43 ('5.0.0', 'liberty'),
44+ ('6.0.0', 'mitaka'),
45 ]),
46 'heat-common': OrderedDict([
47 ('5.0.0', 'liberty'),
48+ ('6.0.0', 'mitaka'),
49 ]),
50 'glance-common': OrderedDict([
51 ('11.0.0', 'liberty'),
52+ ('12.0.0', 'mitaka'),
53 ]),
54 'openstack-dashboard': OrderedDict([
55 ('8.0.0', 'liberty'),
56+ ('9.0.0', 'mitaka'),
57 ]),
58 }
59
60@@ -377,6 +388,9 @@
61 'liberty': 'trusty-updates/liberty',
62 'liberty/updates': 'trusty-updates/liberty',
63 'liberty/proposed': 'trusty-proposed/liberty',
64+ 'mitaka': 'trusty-updates/mitaka',
65+ 'mitaka/updates': 'trusty-updates/mitaka',
66+ 'mitaka/proposed': 'trusty-proposed/mitaka',
67 }
68
69 try:
70
71=== modified file 'charmhelpers/fetch/__init__.py'
72--- charmhelpers/fetch/__init__.py 2015-12-09 23:06:09 +0000
73+++ charmhelpers/fetch/__init__.py 2015-12-14 14:32:58 +0000
74@@ -98,6 +98,14 @@
75 'liberty/proposed': 'trusty-proposed/liberty',
76 'trusty-liberty/proposed': 'trusty-proposed/liberty',
77 'trusty-proposed/liberty': 'trusty-proposed/liberty',
78+ # Mitaka
79+ 'mitaka': 'trusty-updates/mitaka',
80+ 'trusty-mitaka': 'trusty-updates/mitaka',
81+ 'trusty-mitaka/updates': 'trusty-updates/mitaka',
82+ 'trusty-updates/mitaka': 'trusty-updates/mitaka',
83+ 'mitaka/proposed': 'trusty-proposed/mitaka',
84+ 'trusty-mitaka/proposed': 'trusty-proposed/mitaka',
85+ 'trusty-proposed/mitaka': 'trusty-proposed/mitaka',
86 }
87
88 # The order of this list is very important. Handlers should be listed in from
89
90=== modified file 'tests/contrib/openstack/test_openstack_utils.py'
91--- tests/contrib/openstack/test_openstack_utils.py 2015-09-21 18:50:08 +0000
92+++ tests/contrib/openstack/test_openstack_utils.py 2015-12-14 14:32:58 +0000
93@@ -73,7 +73,7 @@
94 },
95 # poorly formed openstack version
96 'bad-version': {
97- 'pkg_vers': '1:2016.1-0ubuntu1.1~cloud0',
98+ 'pkg_vers': '1:2200.1-0ubuntu1.1~cloud0',
99 'os_release': None,
100 'os_version': None
101 }
102@@ -264,7 +264,7 @@
103 with patch('apt_pkg.Cache') as cache:
104 cache.return_value = self._apt_cache()
105 openstack.get_os_codename_package('bad-version')
106- _e = ('Could not determine OpenStack codename for version 2016.1')
107+ _e = ('Could not determine OpenStack codename for version 2200.1')
108 mocked_error.assert_called_with(_e)
109
110 @patch('charmhelpers.contrib.openstack.utils.error_out')

Subscribers

People subscribed via source and target branches