Charm Helpers

Merge lp:~james-page/charm-helpers/yakkety-newton-amulet into lp:charm-helpers

  1. yakkety-newton-amulet
  2. Merge into devel
Proposed by James Page
Status: Merged
Merged at revision: 629
Proposed branch: lp:~james-page/charm-helpers/yakkety-newton-amulet
Merge into: lp:charm-helpers
Diff against target: 25 lines (+6/-2)
1 file modified
charmhelpers/contrib/openstack/amulet/deployment.py (+6/-2)
To merge this branch: bzr merge lp:~james-page/charm-helpers/yakkety-newton-amulet
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+306201@code.launchpad.net

Description of the change

Add amulet helper support for new OpenStack release.

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

LGTM, thanks

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-07-12 15:11:15 +0000
3+++ charmhelpers/contrib/openstack/amulet/deployment.py 2016-09-20 10:30:59 +0000
4@@ -220,7 +220,8 @@
5 self.trusty_icehouse, self.trusty_juno, self.utopic_juno,
6 self.trusty_kilo, self.vivid_kilo, self.trusty_liberty,
7 self.wily_liberty, self.trusty_mitaka,
8- self.xenial_mitaka) = range(14)
9+ self.xenial_mitaka, self.xenial_newton,
10+ self.yakkety_newton) = range(16)
11
12 releases = {
13 ('precise', None): self.precise_essex,
14@@ -236,7 +237,10 @@
15 ('utopic', None): self.utopic_juno,
16 ('vivid', None): self.vivid_kilo,
17 ('wily', None): self.wily_liberty,
18- ('xenial', None): self.xenial_mitaka}
19+ ('xenial', None): self.xenial_mitaka,
20+ ('xenial', 'cloud:xenial-newton'): self.xenial_newton,
21+ ('yakkety', None): self.yakkety_newton,
22+ }
23 return releases[(self.series, self.openstack)]
24
25 def _get_openstack_release_string(self):

Subscribers

People subscribed via source and target branches