openstack/charm-neutron-openvswitch
Code Issues Proposed changes

Fix bug causing install to fail as neutron-common not installed yet

Browse Source
This commit is contained in:
Liam Young 2014-06-23 14:37:47 +01:00
parent ede7d8ae8d
commit 5f6058e843
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hooks/charmhelpers/contrib/openstack/utils.py
View File

@ -83,6 +83,8 @@ def get_os_codename_install_source(src):
'''Derive OpenStack release codename from a given installation source.''' '''Derive OpenStack release codename from a given installation source.'''
ubuntu_rel = lsb_release()['DISTRIB_CODENAME'] ubuntu_rel = lsb_release()['DISTRIB_CODENAME']
rel = '' rel = ''
if src is None:
return rel
if src in ['distro', 'distro-proposed']: if src in ['distro', 'distro-proposed']:
try: try:
rel = UBUNTU_OPENSTACK_RELEASE[ubuntu_rel] rel = UBUNTU_OPENSTACK_RELEASE[ubuntu_rel]

2
hooks/neutron_ovs_utils.py
View File

@ -38,7 +38,7 @@ def determine_packages():
def register_configs(release=None): def register_configs(release=None):
release = release or os_release('neutron-common') release = release or os_release('neutron-common', base='icehouse')
configs = templating.OSConfigRenderer(templates_dir=TEMPLATES, configs = templating.OSConfigRenderer(templates_dir=TEMPLATES,
openstack_release=release) openstack_release=release)
for cfg, rscs in resource_map().iteritems(): for cfg, rscs in resource_map().iteritems():