openstack/charm-neutron-api
Code Issues Proposed changes

Change to the dhcp-agents-per-network setting such that it is always active

Browse Source 
and not just when enable-l3ha is true.  This is to provide non-ha environments
with the option to have multiple dhcp agents (which are controlled directly by
neutron).  The default, is therefore, 1.
This commit is contained in:
Alex Kavanagh 2016-01-20 16:38:56 +00:00
parent da4744543b
commit b17bf9ed8d
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.yaml
View File

@ -399,7 +399,7 @@ options:
Minimum number of l3 agents to host a router. Only used when enable-l3ha Minimum number of l3 agents to host a router. Only used when enable-l3ha
is True is True
dhcp-agents-per-network: dhcp-agents-per-network:
default: 2 default: 1
type: int type: int
description: | description: |
The number of dhcp agents to be deployed per network. This option is The number of dhcp agents to be deployed per network. This option is

2
hooks/neutron_api_context.py
View File

@ -174,7 +174,7 @@ class NeutronCCContext(context.NeutronContext):
config('max-l3-agents-per-router') config('max-l3-agents-per-router')
ctxt['min_l3_agents_per_router'] = \ ctxt['min_l3_agents_per_router'] = \
config('min-l3-agents-per-router') config('min-l3-agents-per-router')
ctxt['dhcp_agents_per_network'] = config('dhcp-agents-per-network') ctxt['dhcp_agents_per_network'] = config('dhcp-agents-per-network')
ctxt['overlay_network_type'] = self.neutron_overlay_network_type ctxt['overlay_network_type'] = self.neutron_overlay_network_type
ctxt['external_network'] = config('neutron-external-network') ctxt['external_network'] = config('neutron-external-network')
if config('neutron-plugin') in ['vsp']: if config('neutron-plugin') in ['vsp']:

2
unit_tests/test_neutron_api_context.py
View File

@ -298,6 +298,7 @@ class NeutronCCContextTest(CharmTestCase):
'debug': True, 'debug': True,
'enable_dvr': False, 'enable_dvr': False,
'l3_ha': False, 'l3_ha': False,
'dhcp_agents_per_network': 3,
'external_network': 'bob', 'external_network': 'bob',
'neutron_bind_port': self.api_port, 'neutron_bind_port': self.api_port,
'verbose': True, 'verbose': True,
@ -332,6 +333,7 @@ class NeutronCCContextTest(CharmTestCase):
'debug': True, 'debug': True,
'enable_dvr': False, 'enable_dvr': False,
'l3_ha': False, 'l3_ha': False,
'dhcp_agents_per_network': 3,
'external_network': 'bob', 'external_network': 'bob',
'neutron_bind_port': self.api_port, 'neutron_bind_port': self.api_port,
'verbose': True, 'verbose': True,