← Back to branch summary

~james-page/charms/trusty/neutron-api/ml2-local-types

« back to all changes in this revision

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

  • Committer: james.page at ubuntu
  • Date: 2015-09-02 15:00:01 UTC
  • mfrom: (134.1.3 neutron-api)
  • Revision ID: james.page@ubuntu.com-20150902150001-078q9ha720h8n29h
[bbaqar,r=james-page] Add support for PLUMgrid SDN

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.
195
193
        error_out(e)
196
194
 
197
195
 
198
 
def get_os_version_codename(codename):
 
196
def get_os_version_codename(codename, version_map=OPENSTACK_CODENAMES):
199
197
    '''Determine OpenStack version number from codename.'''
200
 
    for k, v in six.iteritems(OPENSTACK_CODENAMES):
 
198
    for k, v in six.iteritems(version_map):
201
199
        if v == codename:
202
200
            return k
203
201
    e = 'Could not derive OpenStack version for '\
429
427
    import apt_pkg as apt
430
428
    src = config('openstack-origin')
431
429
    cur_vers = get_os_version_package(package)
432
 
    available_vers = get_os_version_install_source(src)
 
430
    if "swift" in package:
 
431
        codename = get_os_codename_install_source(src)
 
432
        available_vers = get_os_version_codename(codename, SWIFT_CODENAMES)
 
433
    else:
 
434
        available_vers = get_os_version_install_source(src)
433
435
    apt.init()
434
436
    return apt.version_compare(available_vers, cur_vers) == 1
435
437