Merge lp:~1chb1n/charm-helpers/openstack-amulet-ocata into lp:charm-helpers

Proposed by Ryan Beisner
Status: Merged
Merged at revision: 659
Proposed branch: lp:~1chb1n/charm-helpers/openstack-amulet-ocata
Merge into: lp:charm-helpers
Diff against target: 71 lines (+9/-26)
1 file modified
charmhelpers/contrib/openstack/amulet/deployment.py (+9/-26)
To merge this branch: bzr merge lp:~1chb1n/charm-helpers/openstack-amulet-ocata
Reviewer Review Type Date Requested Status
David Ames (community) Approve
Review via email: mp+310823@code.launchpad.net

Commit message

Update OpenStack Amulet test helpers

 - Add Zesty and Ocata
 - Remove Precise and other deprecated releases
 - Ref: https://www.ubuntu.com/info/release-end-of-life

Description of the change

Update OpenStack Amulet test helpers

 - Add Zesty and Ocata
 - Remove Precise and other deprecated releases
 - Ref: https://www.ubuntu.com/info/release-end-of-life

To post a comment you must log in.
Revision history for this message
David Ames (thedac) wrote :

Looks good. Merging.

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-10-07 09:34:01 +0000
3+++ charmhelpers/contrib/openstack/amulet/deployment.py 2016-11-15 18:56:28 +0000
4@@ -69,9 +69,9 @@
5
6 # Charms outside the ~openstack-charmers
7 base_charms = {
8- 'mysql': ['precise', 'trusty'],
9- 'mongodb': ['precise', 'trusty'],
10- 'nrpe': ['precise', 'trusty', 'wily', 'xenial'],
11+ 'mysql': ['trusty'],
12+ 'mongodb': ['trusty'],
13+ 'nrpe': ['trusty', 'xenial'],
14 }
15
16 for svc in other_services:
17@@ -260,31 +260,20 @@
18 release.
19 """
20 # Must be ordered by OpenStack release (not by Ubuntu release):
21- (self.precise_essex, self.precise_folsom, self.precise_grizzly,
22- self.precise_havana, self.precise_icehouse,
23- self.trusty_icehouse, self.trusty_juno, self.utopic_juno,
24- self.trusty_kilo, self.vivid_kilo, self.trusty_liberty,
25- self.wily_liberty, self.trusty_mitaka,
26- self.xenial_mitaka, self.xenial_newton,
27- self.yakkety_newton) = range(16)
28+ (self.trusty_icehouse, self.trusty_kilo, self.trusty_liberty,
29+ self.trusty_mitaka, self.xenial_mitaka, self.xenial_newton,
30+ self.yakkety_newton, self.xenial_ocata, self.zesty_ocata) = range(9)
31
32 releases = {
33- ('precise', None): self.precise_essex,
34- ('precise', 'cloud:precise-folsom'): self.precise_folsom,
35- ('precise', 'cloud:precise-grizzly'): self.precise_grizzly,
36- ('precise', 'cloud:precise-havana'): self.precise_havana,
37- ('precise', 'cloud:precise-icehouse'): self.precise_icehouse,
38 ('trusty', None): self.trusty_icehouse,
39- ('trusty', 'cloud:trusty-juno'): self.trusty_juno,
40 ('trusty', 'cloud:trusty-kilo'): self.trusty_kilo,
41 ('trusty', 'cloud:trusty-liberty'): self.trusty_liberty,
42 ('trusty', 'cloud:trusty-mitaka'): self.trusty_mitaka,
43- ('utopic', None): self.utopic_juno,
44- ('vivid', None): self.vivid_kilo,
45- ('wily', None): self.wily_liberty,
46 ('xenial', None): self.xenial_mitaka,
47 ('xenial', 'cloud:xenial-newton'): self.xenial_newton,
48+ ('xenial', 'cloud:xenial-ocata'): self.xenial_ocata,
49 ('yakkety', None): self.yakkety_newton,
50+ ('zesty', None): self.zesty_ocata,
51 }
52 return releases[(self.series, self.openstack)]
53
54@@ -294,16 +283,10 @@
55 Return a string representing the openstack release.
56 """
57 releases = OrderedDict([
58- ('precise', 'essex'),
59- ('quantal', 'folsom'),
60- ('raring', 'grizzly'),
61- ('saucy', 'havana'),
62 ('trusty', 'icehouse'),
63- ('utopic', 'juno'),
64- ('vivid', 'kilo'),
65- ('wily', 'liberty'),
66 ('xenial', 'mitaka'),
67 ('yakkety', 'newton'),
68+ ('zesty', 'ocata'),
69 ])
70 if self.openstack:
71 os_origin = self.openstack.split(':')[1]

Subscribers

People subscribed via source and target branches