openstack/charm-neutron-gateway
Code Issues Proposed changes

[gnuoy, r=jamespage] conntrack needed for ha

Browse Source
This commit is contained in:
Liam Young 2015-07-09 12:02:45 +01:00
commit 5f6ced9bf7
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hooks/neutron_utils.py
View File

@ -183,7 +183,7 @@ LEGACY_FILES_MAP = {
}, },
} }
LEGACY_RES_MAP = ['res_monitor'] LEGACY_RES_MAP = ['res_monitor']
L3HA_PACKAGES = ['keepalived'] L3HA_PACKAGES = ['keepalived', 'conntrack']
BASE_GIT_PACKAGES = [ BASE_GIT_PACKAGES = [
'dnsmasq', 'dnsmasq',

3
unit_tests/test_neutron_hooks.py
View File

@ -339,7 +339,8 @@ class TestQuantumHooks(CharmTestCase):
def test_neutron_plugin_changed(self): def test_neutron_plugin_changed(self):
self.use_l3ha.return_value = True self.use_l3ha.return_value = True
self._call_hook('neutron-plugin-api-relation-changed') 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) self.assertTrue(self.CONFIGS.write_all.called)
def test_cluster_departed_nvp(self): def test_cluster_departed_nvp(self):