From 467226f2d171181ec92874613b4dd415161e5264 Mon Sep 17 00:00:00 2001 From: Ryan Beisner Date: Fri, 26 Jun 2015 17:44:36 +0000 Subject: [PATCH] fix for grizzly assumptions - bug 1469241 --- hooks/ceilometer_hooks.py | 3 --- hooks/ceilometer_utils.py | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/hooks/ceilometer_hooks.py b/hooks/ceilometer_hooks.py index 3c0f947..78c6909 100755 --- a/hooks/ceilometer_hooks.py +++ b/hooks/ceilometer_hooks.py @@ -38,9 +38,6 @@ CONFIGS = register_configs() @hooks.hook() def install(): origin = config('openstack-origin') - if (lsb_release()['DISTRIB_CODENAME'] == 'precise' - and origin == 'distro'): - origin = 'cloud:precise-grizzly' configure_installation_source(origin) apt_update(fatal=True) apt_install( diff --git a/hooks/ceilometer_utils.py b/hooks/ceilometer_utils.py index b77c413..be2724c 100644 --- a/hooks/ceilometer_utils.py +++ b/hooks/ceilometer_utils.py @@ -66,7 +66,7 @@ def register_configs(): # just default to earliest supported release. configs dont get touched # till post-install, anyway. release = get_os_codename_package('ceilometer-common', fatal=False) \ - or 'grizzly' + or 'icehouse' configs = templating.OSConfigRenderer(templates_dir=TEMPLATES, openstack_release=release)