openstack/charm-ceph-mon
Code Issues Proposed changes

Sync charm-helpers for Rocky series support

Browse Source 
Change-Id: I6219e1f6a3037ce88b415b7857e66265ecb96c00
This commit is contained in:
Corey Bryant
2018-06-21 18:50:39 +00:00
parent e071486acf
commit b9b7cac78c
7 changed files with 37 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/charmhelpers/contrib/openstack/amulet/deployment.py
View File

@@ -291,6 +291,8 @@ class OpenStackAmuletDeployment(AmuletDeployment):
('zesty', None): self.zesty_ocata,
('artful', None): self.artful_pike,
('bionic', None): self.bionic_queens,
('bionic', 'cloud:bionic-rocky'): self.bionic_rocky,
('cosmic', None): self.cosmic_rocky,
}
return releases[(self.series, self.openstack)]
@@ -306,6 +308,7 @@ class OpenStackAmuletDeployment(AmuletDeployment):
('zesty', 'ocata'),
('artful', 'pike'),
('bionic', 'queens'),
('cosmic', 'rocky'),
])
if self.openstack:
os_origin = self.openstack.split(':')[1]

2
tests/charmhelpers/contrib/openstack/amulet/utils.py
View File

@@ -56,7 +56,7 @@ OPENSTACK_RELEASES_PAIRS = [
'trusty_mitaka', 'xenial_mitaka', 'xenial_newton',
'yakkety_newton', 'xenial_ocata', 'zesty_ocata',
'xenial_pike', 'artful_pike', 'xenial_queens',
'bionic_queens']
'bionic_queens', 'bionic_rocky', 'cosmic_rocky']
class OpenStackAmuletUtils(AmuletUtils):