Merge lp:~james-page/charms/trusty/nova-compute/neutron-plugin-sub-config into lp:~openstack-charmers-archive/charms/trusty/nova-compute/next

[James Page]

[Liam Young (gnuoy)]

Approve

review: Approve

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #6229 nova-compute-next for james-page mp264854
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/6229/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #5861 nova-compute-next for james-page mp264854
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/5861/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #5128 nova-compute-next for james-page mp264854
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/5128/

=== modified file 'hooks/charmhelpers/contrib/openstack/context.py'
--- hooks/charmhelpers/contrib/openstack/context.py	2015-06-19 15:09:56 +0000
+++ hooks/charmhelpers/contrib/openstack/context.py	2015-07-15 14:22:16 +0000
@@ -891,8 +891,6 @@
         return ctxt
 
     def __call__(self):
-        self._ensure_packages()
-
         if self.network_manager not in ['quantum', 'neutron']:
             return {}
 

=== modified file 'hooks/nova_compute_context.py'
--- hooks/nova_compute_context.py	2015-03-31 13:22:53 +0000
+++ hooks/nova_compute_context.py	2015-07-15 14:22:16 +0000
@@ -444,7 +444,9 @@
         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'),

=== modified file 'hooks/nova_compute_utils.py'
--- hooks/nova_compute_utils.py	2015-05-12 19:53:02 +0000
+++ hooks/nova_compute_utils.py	2015-07-15 14:22:16 +0000
@@ -158,6 +158,10 @@
                          interface='nova-ceilometer',
                          service='nova',
                          config_file=NOVA_CONF),
+                     context.SubordinateConfigContext(
+                         interface='neutron-plugin',
+                         service='nova-compute',
+                         config_file=NOVA_CONF),
                      InstanceConsoleContext(),
                      context.ZeroMQContext(),
                      context.NotificationDriverContext(),