← Back to branch summary

~hopem/charms/trusty/rabbitmq-server/lp1510902-stable-backport

« back to all changes in this revision

Viewing changes to hooks/charmhelpers/contrib/openstack/utils.py

  • Committer: Liam Young
  • Date: 2015-09-23 12:04:43 UTC
  • Revision ID: liam.young@canonical.com-20150923120443-ynq4v5aj49a7tcm3
Charmhelper sync

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/contrib/openstack/utils.py
1
 
#!/usr/bin/python
2
 
 
3
1
# Copyright 2014-2015 Canonical Limited.
4
2
#
5
3
# This file is part of charm-helpers.
167
165
        error_out(e)
168
166
 
169
167
 
170
 
def get_os_version_codename(codename):
 
168
def get_os_version_codename(codename, version_map=OPENSTACK_CODENAMES):
171
169
    '''Determine OpenStack version number from codename.'''
172
 
    for k, v in six.iteritems(OPENSTACK_CODENAMES):
 
170
    for k, v in six.iteritems(version_map):
173
171
        if v == codename:
174
172
            return k
175
173
    e = 'Could not derive OpenStack version for '\
392
390
    import apt_pkg as apt
393
391
    src = config('openstack-origin')
394
392
    cur_vers = get_os_version_package(package)
395
 
    available_vers = get_os_version_install_source(src)
 
393
    if "swift" in package:
 
394
        codename = get_os_codename_install_source(src)
 
395
        available_vers = get_os_version_codename(codename, SWIFT_CODENAMES)
 
396
    else:
 
397
        available_vers = get_os_version_install_source(src)
396
398
    apt.init()
397
399
    return apt.version_compare(available_vers, cur_vers) == 1
398
400