openstack/charm-nova-compute
Code Issues Proposed changes

[james-page, r=gnuoy] Charmhelper sync

Browse Source
This commit is contained in:
Liam Young 2016-01-06 08:15:13 +00:00
commit 803d15a007
1 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
hooks/charmhelpers/contrib/openstack/utils.py
View File

@ -131,40 +131,40 @@ SWIFT_CODENAMES = OrderedDict([
# >= Liberty version->codename mapping # >= Liberty version->codename mapping
PACKAGE_CODENAMES = { PACKAGE_CODENAMES = {
'nova-common': OrderedDict([ 'nova-common': OrderedDict([
('12.0.0', 'liberty'), ('12.0', 'liberty'),
('13.0.0', 'mitaka'), ('13.0', 'mitaka'),
]), ]),
'neutron-common': OrderedDict([ 'neutron-common': OrderedDict([
('7.0.0', 'liberty'), ('7.0', 'liberty'),
('8.0.0', 'mitaka'), ('8.0', 'mitaka'),
]), ]),
'cinder-common': OrderedDict([ 'cinder-common': OrderedDict([
('7.0.0', 'liberty'), ('7.0', 'liberty'),
('8.0.0', 'mitaka'), ('8.0', 'mitaka'),
]), ]),
'keystone': OrderedDict([ 'keystone': OrderedDict([
('8.0.0', 'liberty'), ('8.0', 'liberty'),
('9.0.0', 'mitaka'), ('9.0', 'mitaka'),
]), ]),
'horizon-common': OrderedDict([ 'horizon-common': OrderedDict([
('8.0.0', 'liberty'), ('8.0', 'liberty'),
('9.0.0', 'mitaka'), ('9.0', 'mitaka'),
]), ]),
'ceilometer-common': OrderedDict([ 'ceilometer-common': OrderedDict([
('5.0.0', 'liberty'), ('5.0', 'liberty'),
('6.0.0', 'mitaka'), ('6.0', 'mitaka'),
]), ]),
'heat-common': OrderedDict([ 'heat-common': OrderedDict([
('5.0.0', 'liberty'), ('5.0', 'liberty'),
('6.0.0', 'mitaka'), ('6.0', 'mitaka'),
]), ]),
'glance-common': OrderedDict([ 'glance-common': OrderedDict([
('11.0.0', 'liberty'), ('11.0', 'liberty'),
('12.0.0', 'mitaka'), ('12.0', 'mitaka'),
]), ]),
'openstack-dashboard': OrderedDict([ 'openstack-dashboard': OrderedDict([
('8.0.0', 'liberty'), ('8.0', 'liberty'),
('9.0.0', 'mitaka'), ('9.0', 'mitaka'),
]), ]),
} }
@ -251,7 +251,14 @@ def get_os_codename_package(package, fatal=True):
error_out(e) error_out(e)
vers = apt.upstream_version(pkg.current_ver.ver_str) vers = apt.upstream_version(pkg.current_ver.ver_str)
match = re.match('^(\d+)\.(\d+)\.(\d+)', vers) if 'swift' in pkg.name:
# Fully x.y.z match for swift versions
match = re.match('^(\d+)\.(\d+)\.(\d+)', vers)
else:
# x.y match only for 20XX.X
# and ignore patch level for other packages
match = re.match('^(\d+)\.(\d+)', vers)
if match: if match:
vers = match.group(0) vers = match.group(0)
@ -263,13 +270,8 @@ def get_os_codename_package(package, fatal=True):
# < Liberty co-ordinated project versions # < Liberty co-ordinated project versions
try: try:
if 'swift' in pkg.name: if 'swift' in pkg.name:
swift_vers = vers[:5] return SWIFT_CODENAMES[vers]
if swift_vers not in SWIFT_CODENAMES:
# Deal with 1.10.0 upward
swift_vers = vers[:6]
return SWIFT_CODENAMES[swift_vers]
else: else:
vers = vers[:6]
return OPENSTACK_CODENAMES[vers] return OPENSTACK_CODENAMES[vers]
except KeyError: except KeyError:
if not fatal: if not fatal: