← Back to branch summary

~corey.bryant/charms/trusty/openstack-dashboard/charm-proof-next

« back to all changes in this revision

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

  • Committer: Liam Young
  • Date: 2015-01-12 17:09:42 UTC
  • mfrom: (41.3.11 openstack-dashboard)
  • Revision ID: liam.young@canonical.com-20150112170942-kefvsi5zqijk0wiz
[gnuoy,r=james-page] Add support for nrpe

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/contrib/openstack/utils.py
53
53
    ('saucy', 'havana'),
54
54
    ('trusty', 'icehouse'),
55
55
    ('utopic', 'juno'),
 
56
    ('vivid', 'kilo'),
56
57
])
57
58
 
58
59
 
64
65
    ('2013.2', 'havana'),
65
66
    ('2014.1', 'icehouse'),
66
67
    ('2014.2', 'juno'),
 
68
    ('2015.1', 'kilo'),
67
69
])
68
70
 
69
71
# The ugly duckling
84
86
    ('2.0.0', 'juno'),
85
87
    ('2.1.0', 'juno'),
86
88
    ('2.2.0', 'juno'),
 
89
    ('2.2.1', 'kilo'),
87
90
])
88
91
 
89
92
DEFAULT_LOOPBACK_SIZE = '5G'
289
292
            'juno': 'trusty-updates/juno',
290
293
            'juno/updates': 'trusty-updates/juno',
291
294
            'juno/proposed': 'trusty-proposed/juno',
 
295
            'kilo': 'trusty-updates/kilo',
 
296
            'kilo/updates': 'trusty-updates/kilo',
 
297
            'kilo/proposed': 'trusty-proposed/kilo',
292
298
        }
293
299
 
294
300
        try: