From 20de56e9e5b405061268dc94cc0a41c63b235608 Mon Sep 17 00:00:00 2001
From: Liam Young <liam.young@canonical.com>
Date: Tue, 5 May 2015 17:28:51 +0000
Subject: [PATCH 1/2] conntrack needed for ha

---
 hooks/quantum_utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hooks/quantum_utils.py b/hooks/quantum_utils.py
index 3be8aa2b..dc3aa7e0 100644
--- a/hooks/quantum_utils.py
+++ b/hooks/quantum_utils.py
@@ -182,7 +182,7 @@ LEGACY_FILES_MAP = {
     },
 }
 LEGACY_RES_MAP = ['res_monitor']
-L3HA_PACKAGES = ['keepalived']
+L3HA_PACKAGES = ['keepalived', 'conntrack']
 
 BASE_GIT_PACKAGES = [
     'dnsmasq',

From 5e524cf6f070cabb566a5c98b3f7847fa6b825ae Mon Sep 17 00:00:00 2001
From: Liam Young <liam.young@canonical.com>
Date: Wed, 6 May 2015 10:15:15 +0100
Subject: [PATCH 2/2] Fix lint and unit tests

---
 unit_tests/test_quantum_hooks.py | 3 ++-
 unit_tests/test_quantum_utils.py | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/unit_tests/test_quantum_hooks.py b/unit_tests/test_quantum_hooks.py
index a530352e..afff6cb9 100644
--- a/unit_tests/test_quantum_hooks.py
+++ b/unit_tests/test_quantum_hooks.py
@@ -339,7 +339,8 @@ class TestQuantumHooks(CharmTestCase):
     def test_neutron_plugin_changed(self):
         self.use_l3ha.return_value = True
         self._call_hook('neutron-plugin-api-relation-changed')
-        self.apt_install.assert_called_with(['keepalived'], fatal=True)
+        self.apt_install.assert_called_with(['keepalived', 'conntrack'],
+                                            fatal=True)
         self.assertTrue(self.CONFIGS.write_all.called)
 
     def test_cluster_departed_nvp(self):
diff --git a/unit_tests/test_quantum_utils.py b/unit_tests/test_quantum_utils.py
index 2a72721f..634024b6 100644
--- a/unit_tests/test_quantum_utils.py
+++ b/unit_tests/test_quantum_utils.py
@@ -929,8 +929,10 @@ class TestQuantumAgentReallocation(CharmTestCase):
             'start_dir': '/var/lib/neutron',
             'process_name': 'neutron-nvsd-agent',
             'executable_name': '/usr/local/bin/neutron-nvsd-agent',
-            'config_files': ['/etc/neutron/neutron.conf',
-                         '/etc/neutron/plugins/oneconvergence/nvsdplugin.ini'],
+            'config_files': [
+                '/etc/neutron/neutron.conf',
+                '/etc/neutron/plugins/oneconvergence/nvsdplugin.ini'
+            ],
             'log_file': '/var/log/neutron/nvsd-agent.log',
         }
         neutron_plugin_openflow_context = {