Merge lp:~james-page/charms/trusty/neutron-openvswitch/lp1515008 into lp:~openstack-charmers-archive/charms/trusty/neutron-openvswitch/next

[James Page]

Ensure that the right packages are installed with dvr is enabled, but local dhcp and metadata is disabled.

l3-agent depends on metadata-agent, so ensure that metadata-agent is not purged in this scenario.

[Liam Young (gnuoy)]

Approved

review: Approve

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

charm_lint_check #13480 neutron-openvswitch-next for james-page mp277325
    LINT OK: passed

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

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

charm_unit_test #12611 neutron-openvswitch-next for james-page mp277325
    UNIT OK: passed

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

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

charm_amulet_test #7841 neutron-openvswitch-next for james-page mp277325
    AMULET OK: passed

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

=== modified file 'hooks/neutron_ovs_hooks.py'
--- hooks/neutron_ovs_hooks.py	2015-10-08 13:25:23 +0000
+++ hooks/neutron_ovs_hooks.py	2015-11-12 09:37:11 +0000
@@ -2,6 +2,8 @@
 
 import sys
 
+from copy import deepcopy
+
 from charmhelpers.contrib.openstack.utils import (
     config_value_changed,
     git_install_requested,
@@ -28,6 +30,7 @@
 from neutron_ovs_utils import (
     DHCP_PACKAGES,
     DVR_PACKAGES,
+    METADATA_PACKAGES,
     configure_ovs,
     git_install,
     get_topics,
@@ -89,7 +92,13 @@
     if enable_local_dhcp():
         install_packages()
     else:
-        purge_packages(DHCP_PACKAGES)
+        pkgs = deepcopy(DHCP_PACKAGES)
+        # NOTE: only purge metadata packages if dvr is not
+        #       in use as this will remove the l3 agent
+        #       see https://pad.lv/1515008
+        if not use_dvr():
+            pkgs.extend(METADATA_PACKAGES)
+        purge_packages(pkgs)
     secret = get_shared_secret() if enable_nova_metadata() else None
     rel_data = {
         'metadata-shared-secret': secret,
 
=== modified file 'hooks/neutron_ovs_utils.py'
--- hooks/neutron_ovs_utils.py	2015-10-07 10:41:12 +0000
+++ hooks/neutron_ovs_utils.py	2015-11-12 09:37:11 +0000
@@ -97,7 +97,8 @@
 EXT_PORT_CONF = '/etc/init/ext-port.conf'
 NEUTRON_METADATA_AGENT_CONF = "/etc/neutron/metadata_agent.ini"
 DVR_PACKAGES = ['neutron-l3-agent']
-DHCP_PACKAGES = ['neutron-metadata-agent', 'neutron-dhcp-agent']
+DHCP_PACKAGES = ['neutron-dhcp-agent']
+METADATA_PACKAGES = ['neutron-metadata-agent']
 PHY_NIC_MTU_CONF = '/etc/init/os-charm-phy-nic-mtu.conf'
 TEMPLATES = 'templates/'
 
@@ -183,6 +184,7 @@
         pkgs.extend(DVR_PACKAGES)
     if enable_local_dhcp():
         pkgs.extend(DHCP_PACKAGES)
+        pkgs.extend(METADATA_PACKAGES)
 
     if git_install_requested():
         pkgs.extend(BASE_GIT_PACKAGES)
 
=== modified file 'unit_tests/test_neutron_ovs_hooks.py'
--- unit_tests/test_neutron_ovs_hooks.py	2015-09-12 08:58:58 +0000
+++ unit_tests/test_neutron_ovs_hooks.py	2015-11-12 09:37:11 +0000
@@ -140,19 +140,58 @@
         self.purge_packages.assert_called_with(['neutron-l3-agent'])
 
     @patch.object(hooks, 'git_install_requested')
-    def test_neutron_plugin_joined(self, git_requested):
+    def test_neutron_plugin_joined_dvr_dhcp(self, git_requested):
         self.enable_nova_metadata.return_value = True
         self.enable_local_dhcp.return_value = True
-        git_requested.return_value = False
-        self.get_shared_secret.return_value = 'secret'
-        self._call_hook('neutron-plugin-relation-joined')
-        rel_data = {
-            'metadata-shared-secret': 'secret',
-        }
-        self.relation_set.assert_called_with(
-            relation_id=None,
-            **rel_data
-        )
+        self.use_dvr.return_value = True
+        git_requested.return_value = False
+        self.get_shared_secret.return_value = 'secret'
+        self._call_hook('neutron-plugin-relation-joined')
+        rel_data = {
+            'metadata-shared-secret': 'secret',
+        }
+        self.relation_set.assert_called_with(
+            relation_id=None,
+            **rel_data
+        )
+        self.assertTrue(self.install_packages.called)
+
+    @patch.object(hooks, 'git_install_requested')
+    def test_neutron_plugin_joined_dvr_nodhcp(self, git_requested):
+        self.enable_nova_metadata.return_value = True
+        self.enable_local_dhcp.return_value = False
+        self.use_dvr.return_value = True
+        git_requested.return_value = False
+        self.get_shared_secret.return_value = 'secret'
+        self._call_hook('neutron-plugin-relation-joined')
+        rel_data = {
+            'metadata-shared-secret': 'secret',
+        }
+        self.relation_set.assert_called_with(
+            relation_id=None,
+            **rel_data
+        )
+        self.purge_packages.assert_called_with(['neutron-dhcp-agent'])
+        self.assertFalse(self.install_packages.called)
+
+    @patch.object(hooks, 'git_install_requested')
+    def test_neutron_plugin_joined_nodvr_nodhcp(self, git_requested):
+        self.enable_nova_metadata.return_value = False
+        self.enable_local_dhcp.return_value = False
+        self.use_dvr.return_value = False
+        git_requested.return_value = False
+        self.get_shared_secret.return_value = 'secret'
+        self._call_hook('neutron-plugin-relation-joined')
+        rel_data = {
+            'metadata-shared-secret': None,
+        }
+        self.relation_set.assert_called_with(
+            relation_id=None,
+            **rel_data
+        )
+        self.purge_packages.assert_called_with(['neutron-dhcp-agent',
+                                                'neutron-metadata-agent'])
+        self.assertFalse(self.install_packages.called)
 
     def test_amqp_joined(self):
         self._call_hook('amqp-relation-joined')