openstack/charm-nova-compute
Code Issues Proposed changes

Alway set network_manager

Browse Source
This commit is contained in:
James Page 2015-07-14 12:11:25 +01:00
parent ece6aa7b92
commit 0a07dbb856
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hooks/nova_compute_utils.py
View File

@ -423,17 +423,15 @@ def network_manager():
Obtain the network manager advertised by nova-c-c, renaming to Quantum Obtain the network manager advertised by nova-c-c, renaming to Quantum
if required if required
''' '''
manager = None manager = _network_config().get('network_manager')
if neutron_plugin_legacy_mode(): if manager:
manager = _network_config().get('network_manager') manager = manager.lower()
if manager: if manager not in ['quantum', 'neutron']:
manager = manager.lower() return manager
if manager not in ['quantum', 'neutron']: if os_release('nova-common') in ['folsom', 'grizzly']:
return manager return 'quantum'
if os_release('nova-common') in ['folsom', 'grizzly']: else:
return 'quantum' return 'neutron'
else:
return 'neutron'
return manager return manager