fix for grizzly assumptions - bug 1469241
This commit is contained in:
parent
00d0a01b30
commit
467226f2d1
|
@ -38,9 +38,6 @@ CONFIGS = register_configs()
|
||||||
@hooks.hook()
|
@hooks.hook()
|
||||||
def install():
|
def install():
|
||||||
origin = config('openstack-origin')
|
origin = config('openstack-origin')
|
||||||
if (lsb_release()['DISTRIB_CODENAME'] == 'precise'
|
|
||||||
and origin == 'distro'):
|
|
||||||
origin = 'cloud:precise-grizzly'
|
|
||||||
configure_installation_source(origin)
|
configure_installation_source(origin)
|
||||||
apt_update(fatal=True)
|
apt_update(fatal=True)
|
||||||
apt_install(
|
apt_install(
|
||||||
|
|
|
@ -66,7 +66,7 @@ def register_configs():
|
||||||
# just default to earliest supported release. configs dont get touched
|
# just default to earliest supported release. configs dont get touched
|
||||||
# till post-install, anyway.
|
# till post-install, anyway.
|
||||||
release = get_os_codename_package('ceilometer-common', fatal=False) \
|
release = get_os_codename_package('ceilometer-common', fatal=False) \
|
||||||
or 'grizzly'
|
or 'icehouse'
|
||||||
configs = templating.OSConfigRenderer(templates_dir=TEMPLATES,
|
configs = templating.OSConfigRenderer(templates_dir=TEMPLATES,
|
||||||
openstack_release=release)
|
openstack_release=release)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue