openstack/charm-nova-compute
Code Issues Proposed changes

Don't set a network manager if charms turned off managing neutron

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

20
hooks/nova_compute_utils.py
View File

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