openstack/charm-neutron-gateway
Code Issues Proposed changes

Merge "Revert "Enable keepalived VRRP health check""

Browse Source
This commit is contained in:
Zuul 2018-09-25 17:03:12 +00:00 committed by Gerrit Code Review
commit ddcfeb0a95
4 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hooks/neutron_contexts.py
View File

@ -77,7 +77,6 @@ class L3AgentContext(OSContextGenerator):
ctxt['agent_mode'] = 'legacy' ctxt['agent_mode'] = 'legacy'
ctxt['rpc_response_timeout'] = api_settings['rpc_response_timeout'] ctxt['rpc_response_timeout'] = api_settings['rpc_response_timeout']
ctxt['report_interval'] = api_settings['report_interval'] ctxt['report_interval'] = api_settings['report_interval']
ctxt['use_l3ha'] = api_settings['enable_l3ha']
return ctxt return ctxt

3
templates/newton/l3_agent.ini
View File

@ -30,9 +30,6 @@ gateway_external_network_id = {{ ext_net_id }}
external_network_bridge = br-ex external_network_bridge = br-ex
{% endif -%} {% endif -%}
agent_mode = {{ agent_mode }} agent_mode = {{ agent_mode }}
{% if use_l3ha -%}
ha_vrrp_health_check_interval = 30
{% endif -%}
[AGENT] [AGENT]
extensions = fwaas extensions = fwaas

3
templates/queens/l3_agent.ini
View File

@ -25,9 +25,6 @@ gateway_external_network_id = {{ ext_net_id }}
external_network_bridge = br-ex external_network_bridge = br-ex
{% endif -%} {% endif -%}
agent_mode = {{ agent_mode }} agent_mode = {{ agent_mode }}
{% if use_l3ha -%}
ha_vrrp_health_check_interval = 30
{% endif -%}
[AGENT] [AGENT]
extensions = fwaas extensions = fwaas

9
unit_tests/test_neutron_contexts.py
View File

@ -63,7 +63,6 @@ class TestL3AgentContext(CharmTestCase):
DummyNeutronAPIContext(return_value={'enable_dvr': False, DummyNeutronAPIContext(return_value={'enable_dvr': False,
'report_interval': 30, 'report_interval': 30,
'rpc_response_timeout': 60, 'rpc_response_timeout': 60,
'enable_l3ha': True,
}) })
self.test_config.set('run-internal-router', 'none') self.test_config.set('run-internal-router', 'none')
self.test_config.set('external-network-id', '') self.test_config.set('external-network-id', '')
@ -72,7 +71,6 @@ class TestL3AgentContext(CharmTestCase):
{'agent_mode': 'legacy', {'agent_mode': 'legacy',
'report_interval': 30, 'report_interval': 30,
'rpc_response_timeout': 60, 'rpc_response_timeout': 60,
'use_l3ha': True,
'external_configuration_new': True, 'external_configuration_new': True,
'handle_internal_only_router': False, 'handle_internal_only_router': False,
'plugin': 'ovs'}) 'plugin': 'ovs'})
@ -83,7 +81,6 @@ class TestL3AgentContext(CharmTestCase):
DummyNeutronAPIContext(return_value={'enable_dvr': False, DummyNeutronAPIContext(return_value={'enable_dvr': False,
'report_interval': 30, 'report_interval': 30,
'rpc_response_timeout': 60, 'rpc_response_timeout': 60,
'enable_l3ha': True,
}) })
self.test_config.set('run-internal-router', 'none') self.test_config.set('run-internal-router', 'none')
self.test_config.set('ext-port', 'eth1') self.test_config.set('ext-port', 'eth1')
@ -92,7 +89,6 @@ class TestL3AgentContext(CharmTestCase):
{'agent_mode': 'legacy', {'agent_mode': 'legacy',
'report_interval': 30, 'report_interval': 30,
'rpc_response_timeout': 60, 'rpc_response_timeout': 60,
'use_l3ha': True,
'handle_internal_only_router': False, 'handle_internal_only_router': False,
'plugin': 'ovs'}) 'plugin': 'ovs'})
@ -102,7 +98,6 @@ class TestL3AgentContext(CharmTestCase):
DummyNeutronAPIContext(return_value={'enable_dvr': False, DummyNeutronAPIContext(return_value={'enable_dvr': False,
'report_interval': 30, 'report_interval': 30,
'rpc_response_timeout': 60, 'rpc_response_timeout': 60,
'enable_l3ha': True,
}) })
self.test_config.set('run-internal-router', 'leader') self.test_config.set('run-internal-router', 'leader')
self.test_config.set('external-network-id', 'netid') self.test_config.set('external-network-id', 'netid')
@ -111,7 +106,6 @@ class TestL3AgentContext(CharmTestCase):
{'agent_mode': 'legacy', {'agent_mode': 'legacy',
'report_interval': 30, 'report_interval': 30,
'rpc_response_timeout': 60, 'rpc_response_timeout': 60,
'use_l3ha': True,
'handle_internal_only_router': True, 'handle_internal_only_router': True,
'ext_net_id': 'netid', 'ext_net_id': 'netid',
'plugin': 'ovs'}) 'plugin': 'ovs'})
@ -122,7 +116,6 @@ class TestL3AgentContext(CharmTestCase):
DummyNeutronAPIContext(return_value={'enable_dvr': False, DummyNeutronAPIContext(return_value={'enable_dvr': False,
'report_interval': 30, 'report_interval': 30,
'rpc_response_timeout': 60, 'rpc_response_timeout': 60,
'enable_l3ha': True,
}) })
self.test_config.set('run-internal-router', 'all') self.test_config.set('run-internal-router', 'all')
self.test_config.set('external-network-id', 'netid') self.test_config.set('external-network-id', 'netid')
@ -131,7 +124,6 @@ class TestL3AgentContext(CharmTestCase):
{'agent_mode': 'legacy', {'agent_mode': 'legacy',
'report_interval': 30, 'report_interval': 30,
'rpc_response_timeout': 60, 'rpc_response_timeout': 60,
'use_l3ha': True,
'handle_internal_only_router': True, 'handle_internal_only_router': True,
'ext_net_id': 'netid', 'ext_net_id': 'netid',
'plugin': 'ovs'}) 'plugin': 'ovs'})
@ -142,7 +134,6 @@ class TestL3AgentContext(CharmTestCase):
DummyNeutronAPIContext(return_value={'enable_dvr': True, DummyNeutronAPIContext(return_value={'enable_dvr': True,
'report_interval': 30, 'report_interval': 30,
'rpc_response_timeout': 60, 'rpc_response_timeout': 60,
'enable_l3ha': True,
}) })
self.assertEqual(neutron_contexts.L3AgentContext()()['agent_mode'], self.assertEqual(neutron_contexts.L3AgentContext()()['agent_mode'],
'dvr_snat') 'dvr_snat')