From 0320b56a716c4a3a2abfd6d61a69bf578d761e42 Mon Sep 17 00:00:00 2001 From: Zhang Hua Date: Tue, 18 Sep 2018 17:01:13 +0800 Subject: [PATCH] Revert "Enable keepalived VRRP health check" We actually need this upstream feature, but we found it has another bug (lp bug: 1793102), so revert it first. This reverts commit 7b60534ce8d2da45debedf9bf3f7903dbebade43. Change-Id: I8d8a755e250d4d80e269c853a9d3d97c3f364d40 --- hooks/neutron_contexts.py | 1 - templates/newton/l3_agent.ini | 3 --- templates/queens/l3_agent.ini | 3 --- unit_tests/test_neutron_contexts.py | 9 --------- 4 files changed, 16 deletions(-) diff --git a/hooks/neutron_contexts.py b/hooks/neutron_contexts.py index 5bcb9a2e..f4f32c98 100644 --- a/hooks/neutron_contexts.py +++ b/hooks/neutron_contexts.py @@ -77,7 +77,6 @@ class L3AgentContext(OSContextGenerator): ctxt['agent_mode'] = 'legacy' ctxt['rpc_response_timeout'] = api_settings['rpc_response_timeout'] ctxt['report_interval'] = api_settings['report_interval'] - ctxt['use_l3ha'] = api_settings['enable_l3ha'] return ctxt diff --git a/templates/newton/l3_agent.ini b/templates/newton/l3_agent.ini index 4ff0c2cc..27d06c3c 100644 --- a/templates/newton/l3_agent.ini +++ b/templates/newton/l3_agent.ini @@ -30,9 +30,6 @@ gateway_external_network_id = {{ ext_net_id }} external_network_bridge = br-ex {% endif -%} agent_mode = {{ agent_mode }} -{% if use_l3ha -%} -ha_vrrp_health_check_interval = 30 -{% endif -%} [AGENT] extensions = fwaas diff --git a/templates/queens/l3_agent.ini b/templates/queens/l3_agent.ini index d5e003e3..94f590fd 100644 --- a/templates/queens/l3_agent.ini +++ b/templates/queens/l3_agent.ini @@ -25,9 +25,6 @@ gateway_external_network_id = {{ ext_net_id }} external_network_bridge = br-ex {% endif -%} agent_mode = {{ agent_mode }} -{% if use_l3ha -%} -ha_vrrp_health_check_interval = 30 -{% endif -%} [AGENT] extensions = fwaas diff --git a/unit_tests/test_neutron_contexts.py b/unit_tests/test_neutron_contexts.py index 8e3e0988..ca86eb57 100644 --- a/unit_tests/test_neutron_contexts.py +++ b/unit_tests/test_neutron_contexts.py @@ -63,7 +63,6 @@ class TestL3AgentContext(CharmTestCase): DummyNeutronAPIContext(return_value={'enable_dvr': False, 'report_interval': 30, 'rpc_response_timeout': 60, - 'enable_l3ha': True, }) self.test_config.set('run-internal-router', 'none') self.test_config.set('external-network-id', '') @@ -72,7 +71,6 @@ class TestL3AgentContext(CharmTestCase): {'agent_mode': 'legacy', 'report_interval': 30, 'rpc_response_timeout': 60, - 'use_l3ha': True, 'external_configuration_new': True, 'handle_internal_only_router': False, 'plugin': 'ovs'}) @@ -83,7 +81,6 @@ class TestL3AgentContext(CharmTestCase): DummyNeutronAPIContext(return_value={'enable_dvr': False, 'report_interval': 30, 'rpc_response_timeout': 60, - 'enable_l3ha': True, }) self.test_config.set('run-internal-router', 'none') self.test_config.set('ext-port', 'eth1') @@ -92,7 +89,6 @@ class TestL3AgentContext(CharmTestCase): {'agent_mode': 'legacy', 'report_interval': 30, 'rpc_response_timeout': 60, - 'use_l3ha': True, 'handle_internal_only_router': False, 'plugin': 'ovs'}) @@ -102,7 +98,6 @@ class TestL3AgentContext(CharmTestCase): DummyNeutronAPIContext(return_value={'enable_dvr': False, 'report_interval': 30, 'rpc_response_timeout': 60, - 'enable_l3ha': True, }) self.test_config.set('run-internal-router', 'leader') self.test_config.set('external-network-id', 'netid') @@ -111,7 +106,6 @@ class TestL3AgentContext(CharmTestCase): {'agent_mode': 'legacy', 'report_interval': 30, 'rpc_response_timeout': 60, - 'use_l3ha': True, 'handle_internal_only_router': True, 'ext_net_id': 'netid', 'plugin': 'ovs'}) @@ -122,7 +116,6 @@ class TestL3AgentContext(CharmTestCase): DummyNeutronAPIContext(return_value={'enable_dvr': False, 'report_interval': 30, 'rpc_response_timeout': 60, - 'enable_l3ha': True, }) self.test_config.set('run-internal-router', 'all') self.test_config.set('external-network-id', 'netid') @@ -131,7 +124,6 @@ class TestL3AgentContext(CharmTestCase): {'agent_mode': 'legacy', 'report_interval': 30, 'rpc_response_timeout': 60, - 'use_l3ha': True, 'handle_internal_only_router': True, 'ext_net_id': 'netid', 'plugin': 'ovs'}) @@ -142,7 +134,6 @@ class TestL3AgentContext(CharmTestCase): DummyNeutronAPIContext(return_value={'enable_dvr': True, 'report_interval': 30, 'rpc_response_timeout': 60, - 'enable_l3ha': True, }) self.assertEqual(neutron_contexts.L3AgentContext()()['agent_mode'], 'dvr_snat')