Charm Helpers

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

  1. pikeandqueens
  2. Merge into devel
Proposed by James Page
Status: Merged
Merged at revision: 740
Proposed branch: lp:~james-page/charm-helpers/pikeandqueens
Merge into: lp:charm-helpers
Diff against target: 166 lines (+43/-1)
3 files modified
charmhelpers/contrib/openstack/amulet/deployment.py (+5/-1)
charmhelpers/contrib/openstack/utils.py (+37/-0)
charmhelpers/core/host_factory/ubuntu.py (+1/-0)
To merge this branch: bzr merge lp:~james-page/charm-helpers/pikeandqueens
Reviewer Review Type Date Requested Status
Alex Kavanagh Approve
James Page Needs Resubmitting
Review via email: mp+323789@code.launchpad.net

Description of the change

Add support for pike and queens

To post a comment you must log in.
Revision history for this message
Alex Kavanagh (ajkavanagh) wrote :

I think that the following also needs updating as part of the same commit:

- charmhelpers/core/host_factory/ubuntu.py -- L#20 probably needs 'artful' adding.
- charmhelpers/contrib/openstack/amulet/deployment.py -- around L#276 in the methods _get_openstack_release() and _get_openstack_release_string()

This functions also relate to OpenStack and Ubuntu releases.

review: Needs Fixing
lp:~james-page/charm-helpers/pikeandqueens updated
741. By James Page

Misc other updates for artful

Revision history for this message
James Page (james-page) :
review: Needs Resubmitting
Revision history for this message
Alex Kavanagh (ajkavanagh) wrote :

Looks good.

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/amulet/deployment.py'
2--- charmhelpers/contrib/openstack/amulet/deployment.py 2016-11-15 18:56:04 +0000
3+++ charmhelpers/contrib/openstack/amulet/deployment.py 2017-05-09 16:17:30 +0000
4@@ -262,7 +262,8 @@
5 # Must be ordered by OpenStack release (not by Ubuntu release):
6 (self.trusty_icehouse, self.trusty_kilo, self.trusty_liberty,
7 self.trusty_mitaka, self.xenial_mitaka, self.xenial_newton,
8- self.yakkety_newton, self.xenial_ocata, self.zesty_ocata) = range(9)
9+ self.yakkety_newton, self.xenial_ocata, self.zesty_ocata,
10+ self.xenial_pike, self.artful_pike) = range(11)
11
12 releases = {
13 ('trusty', None): self.trusty_icehouse,
14@@ -272,8 +273,10 @@
15 ('xenial', None): self.xenial_mitaka,
16 ('xenial', 'cloud:xenial-newton'): self.xenial_newton,
17 ('xenial', 'cloud:xenial-ocata'): self.xenial_ocata,
18+ ('xenial', 'cloud:xenial-pike'): self.xenial_pike,
19 ('yakkety', None): self.yakkety_newton,
20 ('zesty', None): self.zesty_ocata,
21+ ('artful', None): self.artful_pike,
22 }
23 return releases[(self.series, self.openstack)]
24
25@@ -287,6 +290,7 @@
26 ('xenial', 'mitaka'),
27 ('yakkety', 'newton'),
28 ('zesty', 'ocata'),
29+ ('artful', 'pike'),
30 ])
31 if self.openstack:
32 os_origin = self.openstack.split(':')[1]
33
34=== modified file 'charmhelpers/contrib/openstack/utils.py'
35--- charmhelpers/contrib/openstack/utils.py 2017-03-24 16:50:31 +0000
36+++ charmhelpers/contrib/openstack/utils.py 2017-05-09 16:17:30 +0000
37@@ -111,6 +111,8 @@
38 'newton',
39 'ocata',
40 'pike',
41+ 'queens',
42+ 'rocky',
43 )
44
45 UBUNTU_OPENSTACK_RELEASE = OrderedDict([
46@@ -126,6 +128,7 @@
47 ('xenial', 'mitaka'),
48 ('yakkety', 'newton'),
49 ('zesty', 'ocata'),
50+ ('artful', 'pike'),
51 ])
52
53
54@@ -142,6 +145,7 @@
55 ('2016.1', 'mitaka'),
56 ('2016.2', 'newton'),
57 ('2017.1', 'ocata'),
58+ ('2017.2', 'pike'),
59 ])
60
61 # The ugly duckling - must list releases oldest to newest
62@@ -179,54 +183,81 @@
63 ('13', 'mitaka'),
64 ('14', 'newton'),
65 ('15', 'ocata'),
66+ ('16', 'pike'),
67+ ('17', 'queens'),
68+ ('18', 'rocky'),
69 ]),
70 'neutron-common': OrderedDict([
71 ('7', 'liberty'),
72 ('8', 'mitaka'),
73 ('9', 'newton'),
74 ('10', 'ocata'),
75+ ('11', 'pike'),
76+ ('12', 'queens'),
77+ ('13', 'rocky'),
78 ]),
79 'cinder-common': OrderedDict([
80 ('7', 'liberty'),
81 ('8', 'mitaka'),
82 ('9', 'newton'),
83 ('10', 'ocata'),
84+ ('11', 'pike'),
85+ ('12', 'queens'),
86+ ('13', 'rocky'),
87 ]),
88 'keystone': OrderedDict([
89 ('8', 'liberty'),
90 ('9', 'mitaka'),
91 ('10', 'newton'),
92 ('11', 'ocata'),
93+ ('12', 'pike'),
94+ ('13', 'queens'),
95+ ('14', 'rocky'),
96 ]),
97 'horizon-common': OrderedDict([
98 ('8', 'liberty'),
99 ('9', 'mitaka'),
100 ('10', 'newton'),
101 ('11', 'ocata'),
102+ ('12', 'pike'),
103+ ('13', 'queens'),
104+ ('14', 'rocky'),
105 ]),
106 'ceilometer-common': OrderedDict([
107 ('5', 'liberty'),
108 ('6', 'mitaka'),
109 ('7', 'newton'),
110 ('8', 'ocata'),
111+ ('9', 'pike'),
112+ ('10', 'queens'),
113+ ('11', 'rocky'),
114 ]),
115 'heat-common': OrderedDict([
116 ('5', 'liberty'),
117 ('6', 'mitaka'),
118 ('7', 'newton'),
119 ('8', 'ocata'),
120+ ('9', 'pike'),
121+ ('10', 'queens'),
122+ ('11', 'rocky'),
123 ]),
124 'glance-common': OrderedDict([
125 ('11', 'liberty'),
126 ('12', 'mitaka'),
127 ('13', 'newton'),
128 ('14', 'ocata'),
129+ ('15', 'pike'),
130+ ('16', 'queens'),
131+ ('17', 'rocky'),
132 ]),
133 'openstack-dashboard': OrderedDict([
134 ('8', 'liberty'),
135 ('9', 'mitaka'),
136 ('10', 'newton'),
137 ('11', 'ocata'),
138+ ('12', 'pike'),
139+ ('13', 'queens'),
140+ ('14', 'rocky'),
141 ]),
142 }
143
144@@ -579,6 +610,12 @@
145 'ocata': 'xenial-updates/ocata',
146 'ocata/updates': 'xenial-updates/ocata',
147 'ocata/proposed': 'xenial-proposed/ocata',
148+ 'pike': 'xenial-updates/pike',
149+ 'pike/updates': 'xenial-updates/pike',
150+ 'pike/proposed': 'xenial-proposed/pike',
151+ 'queens': 'xenial-updates/queens',
152+ 'queens/updates': 'xenial-updates/queens',
153+ 'queens/proposed': 'xenial-proposed/queens',
154 }
155
156 try:
157
158=== modified file 'charmhelpers/core/host_factory/ubuntu.py'
159--- charmhelpers/core/host_factory/ubuntu.py 2017-03-24 16:50:31 +0000
160+++ charmhelpers/core/host_factory/ubuntu.py 2017-05-09 16:17:30 +0000
161@@ -19,6 +19,7 @@
162 'xenial',
163 'yakkety',
164 'zesty',
165+ 'artful',
166 )
167
168

Subscribers

People subscribed via source and target branches