← Back to branch summary

~hopem/charms/trusty/ceilometer/lp1518975

« back to all changes in this revision

Viewing changes to ceilometer_utils.py

  • Committer: Corey Bryant
  • Date: 2015-09-22 15:34:48 UTC
  • mfrom: (97 ceilometer)
  • mto: This revision was merged to the branch mainline in revision 99.
  • Revision ID: corey.bryant@canonical.com-20150922153448-b81hzc5hsy2cv3gh
Rebased on trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
ceilometer_utils.py
113
113
    configs = templating.OSConfigRenderer(templates_dir=TEMPLATES,
114
114
                                          openstack_release=release)
115
115
 
116
 
    if (get_os_codename_install_source(config('openstack-origin'))
117
 
            >= 'icehouse'):
 
116
    if (get_os_codename_install_source(
 
117
            config('openstack-origin')) >= 'icehouse'):
118
118
        CONFIG_FILES[CEILOMETER_CONF]['services'] = \
119
119
            CONFIG_FILES[CEILOMETER_CONF]['services'] + ICEHOUSE_SERVICES
120
120
 
194
194
 
195
195
def get_packages():
196
196
    packages = deepcopy(CEILOMETER_PACKAGES)
197
 
    if (get_os_codename_install_source(config('openstack-origin'))
198
 
            >= 'icehouse'):
 
197
    if (get_os_codename_install_source(
 
198
            config('openstack-origin')) >= 'icehouse'):
199
199
        packages = packages + ICEHOUSE_PACKAGES
200
200
    return packages
201
201