← Back to branch summary

~openstack-ubuntu-testing/charms/precise/glance/trunk

« back to all changes in this revision

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

  • Committer: Adam Gandelman
  • Date: 2013-10-17 21:39:32 UTC
  • mfrom: (13.18.7 glance)
  • Revision ID: adamg@canonical.com-20131017213932-07uwux3uu2ndxmzn
Merge upstream charm.

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/contrib/openstack/utils.py
45
45
])
46
46
 
47
47
# The ugly duckling
48
 
SWIFT_CODENAMES = {
49
 
    '1.4.3': 'diablo',
50
 
    '1.4.8': 'essex',
51
 
    '1.7.4': 'folsom',
52
 
    '1.7.6': 'grizzly',
53
 
    '1.7.7': 'grizzly',
54
 
    '1.8.0': 'grizzly',
55
 
    '1.9.0': 'havana',
56
 
    '1.9.1': 'havana',
57
 
}
 
48
SWIFT_CODENAMES = OrderedDict([
 
49
    ('1.4.3', 'diablo'),
 
50
    ('1.4.8', 'essex'),
 
51
    ('1.7.4', 'folsom'),
 
52
    ('1.8.0', 'grizzly'),
 
53
    ('1.7.7', 'grizzly'),
 
54
    ('1.7.6', 'grizzly'),
 
55
    ('1.10.0', 'havana'),
 
56
    ('1.9.1', 'havana'),
 
57
    ('1.9.0', 'havana'),
 
58
])
58
59
 
59
60
 
60
61
def error_out(msg):
137
138
 
138
139
    try:
139
140
        if 'swift' in pkg.name:
140
 
            vers = vers[:5]
141
 
            return SWIFT_CODENAMES[vers]
 
141
            swift_vers = vers[:5]
 
142
            if swift_vers not in SWIFT_CODENAMES:
 
143
                # Deal with 1.10.0 upward
 
144
                swift_vers = vers[:6]
 
145
            return SWIFT_CODENAMES[swift_vers]
142
146
        else:
143
147
            vers = vers[:6]
144
148
            return OPENSTACK_CODENAMES[vers]