From 829347056a2ea1b50e972468054936ec2cd11288 Mon Sep 17 00:00:00 2001 From: James Page Date: Wed, 15 Jul 2015 09:27:44 +0100 Subject: [PATCH] Only install packages and create bridges if operating in legacy mode --- hooks/charmhelpers/contrib/openstack/context.py | 2 -- hooks/nova_compute_context.py | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hooks/charmhelpers/contrib/openstack/context.py b/hooks/charmhelpers/contrib/openstack/context.py index ab400060..9446cba1 100644 --- a/hooks/charmhelpers/contrib/openstack/context.py +++ b/hooks/charmhelpers/contrib/openstack/context.py @@ -891,8 +891,6 @@ class NeutronContext(OSContextGenerator): return ctxt def __call__(self): - self._ensure_packages() - if self.network_manager not in ['quantum', 'neutron']: return {} diff --git a/hooks/nova_compute_context.py b/hooks/nova_compute_context.py index 5281cddd..fee51881 100644 --- a/hooks/nova_compute_context.py +++ b/hooks/nova_compute_context.py @@ -444,7 +444,9 @@ class NeutronComputeContext(context.NeutronContext): if not ovs_ctxt: return {} - self._ensure_bridge() + if config('manage-neutron-plugin-legacy-mode'): + self._ensure_packages() + self._ensure_bridge() ovs_ctxt['local_ip'] = \ get_address_in_network(config('os-data-network'),