fix for grizzly assumptions - bug 1469241

This commit is contained in:
Ryan Beisner 2015-06-26 17:44:36 +00:00
parent 00d0a01b30
commit 467226f2d1
2 changed files with 1 additions and 4 deletions

View File

@ -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(

View File

@ -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)