Merge lp:~gnuoy/charms/trusty/quantum-gateway/conntrack into lp:~openstack-charmers/charms/trusty/quantum-gateway/next

[Liam Young]

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

charm_lint_check #4407 quantum-gateway-next for gnuoy mp258350
    LINT OK: passed

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

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

charm_unit_test #4132 quantum-gateway-next for gnuoy mp258350
    UNIT OK: passed

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

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

charm_amulet_test #4006 quantum-gateway-next for gnuoy mp258350
    AMULET OK: passed

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

[James Page (james-page)]

review: Approve

Unmerged revisions

115. By Liam Young on 2015-05-06

Fix lint and unit tests

114. By Liam Young on 2015-05-05

conntrack needed for ha

=== modified file 'hooks/quantum_utils.py'
--- hooks/quantum_utils.py	2015-04-17 12:04:02 +0000
+++ hooks/quantum_utils.py	2015-05-06 09:17:18 +0000
@@ -182,7 +182,7 @@
     },
 }
 LEGACY_RES_MAP = ['res_monitor']
-L3HA_PACKAGES = ['keepalived']
+L3HA_PACKAGES = ['keepalived', 'conntrack']
 
 BASE_GIT_PACKAGES = [
     'dnsmasq',

=== modified file 'unit_tests/test_quantum_hooks.py'
--- unit_tests/test_quantum_hooks.py	2015-04-10 14:22:04 +0000
+++ unit_tests/test_quantum_hooks.py	2015-05-06 09:17:18 +0000
@@ -339,7 +339,8 @@
     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):

=== modified file 'unit_tests/test_quantum_utils.py'
--- unit_tests/test_quantum_utils.py	2015-04-23 08:14:44 +0000
+++ unit_tests/test_quantum_utils.py	2015-05-06 09:17:18 +0000
@@ -929,8 +929,10 @@
             '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 = {