openstack/charm-neutron-openvswitch
Code Issues Proposed changes

c-h sync

Browse Source
This commit is contained in:
Ryan Beisner
2015-04-20 20:24:42 +00:00
parent f89779073f
commit 45486c1181
3 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
hooks/charmhelpers/contrib/openstack/amulet/deployment.py
View File

@@ -46,15 +46,22 @@ class OpenStackAmuletDeployment(AmuletDeployment):
stable or next branches for the other_services.""" stable or next branches for the other_services."""
base_charms = ['mysql', 'mongodb'] base_charms = ['mysql', 'mongodb']
if self.series in ['precise', 'trusty']:
base_series = self.series
else:
base_series = self.current_next
if self.stable: if self.stable:
for svc in other_services: for svc in other_services:
temp = 'lp:charms/{}' temp = 'lp:charms/{}/{}'
svc['location'] = temp.format(svc['name']) svc['location'] = temp.format(base_series,
svc['name'])
else: else:
for svc in other_services: for svc in other_services:
if svc['name'] in base_charms: if svc['name'] in base_charms:
temp = 'lp:charms/{}' temp = 'lp:charms/{}/{}'
svc['location'] = temp.format(svc['name']) svc['location'] = temp.format(base_series,
svc['name'])
else: else:
temp = 'lp:~openstack-charmers/charms/{}/{}/next' temp = 'lp:~openstack-charmers/charms/{}/{}/next'
svc['location'] = temp.format(self.current_next, svc['location'] = temp.format(self.current_next,
@@ -99,10 +106,12 @@ class OpenStackAmuletDeployment(AmuletDeployment):
Return an integer representing the enum value of the openstack Return an integer representing the enum value of the openstack
release. release.
""" """
# Must be ordered by OpenStack release (not by Ubuntu release):
(self.precise_essex, self.precise_folsom, self.precise_grizzly, (self.precise_essex, self.precise_folsom, self.precise_grizzly,
self.precise_havana, self.precise_icehouse, self.precise_havana, self.precise_icehouse,
self.trusty_icehouse, self.trusty_juno, self.trusty_kilo, self.trusty_icehouse, self.trusty_juno, self.utopic_juno,
self.utopic_juno, self.vivid_kilo) = range(10) self.trusty_kilo, self.vivid_kilo) = range(10)
releases = { releases = {
('precise', None): self.precise_essex, ('precise', None): self.precise_essex,
('precise', 'cloud:precise-folsom'): self.precise_folsom, ('precise', 'cloud:precise-folsom'): self.precise_folsom,

3
tests/charmhelpers/contrib/amulet/utils.py
View File

@@ -79,6 +79,9 @@ class AmuletUtils(object):
for k, v in six.iteritems(commands): for k, v in six.iteritems(commands):
for cmd in v: for cmd in v:
output, code = k.run(cmd) output, code = k.run(cmd)
self.log.debug('{} `{}` returned '
'{}'.format(k.info['unit_name'],
cmd, code))
if code != 0: if code != 0:
return "command `{}` returned {}".format(cmd, str(code)) return "command `{}` returned {}".format(cmd, str(code))
return None return None

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

@@ -46,15 +46,22 @@ class OpenStackAmuletDeployment(AmuletDeployment):
stable or next branches for the other_services.""" stable or next branches for the other_services."""
base_charms = ['mysql', 'mongodb'] base_charms = ['mysql', 'mongodb']
if self.series in ['precise', 'trusty']:
base_series = self.series
else:
base_series = self.current_next
if self.stable: if self.stable:
for svc in other_services: for svc in other_services:
temp = 'lp:charms/{}' temp = 'lp:charms/{}/{}'
svc['location'] = temp.format(svc['name']) svc['location'] = temp.format(base_series,
svc['name'])
else: else:
for svc in other_services: for svc in other_services:
if svc['name'] in base_charms: if svc['name'] in base_charms:
temp = 'lp:charms/{}' temp = 'lp:charms/{}/{}'
svc['location'] = temp.format(svc['name']) svc['location'] = temp.format(base_series,
svc['name'])
else: else:
temp = 'lp:~openstack-charmers/charms/{}/{}/next' temp = 'lp:~openstack-charmers/charms/{}/{}/next'
svc['location'] = temp.format(self.current_next, svc['location'] = temp.format(self.current_next,
@@ -99,10 +106,12 @@ class OpenStackAmuletDeployment(AmuletDeployment):
Return an integer representing the enum value of the openstack Return an integer representing the enum value of the openstack
release. release.
""" """
# Must be ordered by OpenStack release (not by Ubuntu release):
(self.precise_essex, self.precise_folsom, self.precise_grizzly, (self.precise_essex, self.precise_folsom, self.precise_grizzly,
self.precise_havana, self.precise_icehouse, self.precise_havana, self.precise_icehouse,
self.trusty_icehouse, self.trusty_juno, self.trusty_kilo, self.trusty_icehouse, self.trusty_juno, self.utopic_juno,
self.utopic_juno, self.vivid_kilo) = range(10) self.trusty_kilo, self.vivid_kilo) = range(10)
releases = { releases = {
('precise', None): self.precise_essex, ('precise', None): self.precise_essex,
('precise', 'cloud:precise-folsom'): self.precise_folsom, ('precise', 'cloud:precise-folsom'): self.precise_folsom,