← Back to branch summary

~james-page/charms/trusty/ceilometer/tox

« back to all changes in this revision

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

  • Committer: Corey Bryant
  • Date: 2015-06-16 18:20:20 UTC
  • mfrom: (85.1.6 ceilometer)
  • Revision ID: corey.bryant@canonical.com-20150616182020-dbnpuc4l0uug686j
[beisner,r=corey.bryant] Amulet test updates.

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/contrib/openstack/utils.py
79
79
    ('trusty', 'icehouse'),
80
80
    ('utopic', 'juno'),
81
81
    ('vivid', 'kilo'),
 
82
    ('wily', 'liberty'),
82
83
])
83
84
 
84
85
 
91
92
    ('2014.1', 'icehouse'),
92
93
    ('2014.2', 'juno'),
93
94
    ('2015.1', 'kilo'),
 
95
    ('2015.2', 'liberty'),
94
96
])
95
97
 
96
98
# The ugly duckling
113
115
    ('2.2.0', 'juno'),
114
116
    ('2.2.1', 'kilo'),
115
117
    ('2.2.2', 'kilo'),
 
118
    ('2.3.0', 'liberty'),
116
119
])
117
120
 
118
121
DEFAULT_LOOPBACK_SIZE = '5G'
321
324
            'kilo': 'trusty-updates/kilo',
322
325
            'kilo/updates': 'trusty-updates/kilo',
323
326
            'kilo/proposed': 'trusty-proposed/kilo',
 
327
            'liberty': 'trusty-updates/liberty',
 
328
            'liberty/updates': 'trusty-updates/liberty',
 
329
            'liberty/proposed': 'trusty-proposed/liberty',
324
330
        }
325
331
 
326
332
        try:
641
647
        subprocess.check_call(cmd)
642
648
    except subprocess.CalledProcessError:
643
649
        package = os.path.basename(package_dir)
644
 
        error_out("Error updating {} from global-requirements.txt".format(package))
 
650
        error_out("Error updating {} from "
 
651
                  "global-requirements.txt".format(package))
645
652
    os.chdir(orig_dir)
646
653
 
647
654