openstack/charm-nova-compute
Code Issues Proposed changes

Only install packages and create bridges if operating in legacy mode

Browse Source
This commit is contained in:
James Page 2015-07-15 09:27:44 +01:00
parent 0a07dbb856
commit 829347056a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -891,8 +891,6 @@ class NeutronContext(OSContextGenerator):
return ctxt return ctxt
def __call__(self): def __call__(self):
self._ensure_packages()
if self.network_manager not in ['quantum', 'neutron']: if self.network_manager not in ['quantum', 'neutron']:
return {} return {}

4
hooks/nova_compute_context.py
View File

@ -444,7 +444,9 @@ class NeutronComputeContext(context.NeutronContext):
if not ovs_ctxt: if not ovs_ctxt:
return {} return {}
self._ensure_bridge() if config('manage-neutron-plugin-legacy-mode'):
self._ensure_packages()
self._ensure_bridge()
ovs_ctxt['local_ip'] = \ ovs_ctxt['local_ip'] = \
get_address_in_network(config('os-data-network'), get_address_in_network(config('os-data-network'),