openstack/charm-neutron-api
Code Issues Proposed changes

[tinwood, r=thedac] Fixes Bug#1475534 Added config option 'dhcp-agents-per-network'

Browse Source
This commit is contained in:
David Ames 2016-01-21 11:36:42 -08:00
commit 9dea2ec8c9
7 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config.yaml
View File

@ -398,6 +398,12 @@ options:
description: |
Minimum number of l3 agents to host a router. Only used when enable-l3ha
is True
dhcp-agents-per-network:
default: 1
type: int
description: |
The number of dhcp agents to be deployed per network. Note that if the
Calico plugin is being used, this option has no effect.
nagios_servicegroups:
default: ""
type: string

1
hooks/neutron_api_context.py
View File

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

2
templates/icehouse/neutron.conf
View File

@ -47,6 +47,8 @@ neutron_firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptable
{% if neutron_plugin == 'Calico' -%}
dhcp_agents_per_network = 1000
{% else -%}
dhcp_agents_per_network = {{ dhcp_agents_per_network }}
{% endif -%}
{% include "parts/rabbitmq" %}

2
templates/juno/neutron.conf
View File

@ -47,6 +47,8 @@ neutron_firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptable
{% if neutron_plugin == 'Calico' -%}
dhcp_agents_per_network = 1000
{% else -%}
dhcp_agents_per_network = {{ dhcp_agents_per_network }}
{% endif -%}
{% include "parts/rabbitmq" %}

2
templates/kilo/neutron.conf
View File

@ -51,6 +51,8 @@ neutron_firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptable
{% if neutron_plugin == 'Calico' -%}
dhcp_agents_per_network = 1000
{% else -%}
dhcp_agents_per_network = {{ dhcp_agents_per_network }}
{% endif -%}
notify_nova_on_port_status_changes = True

2
templates/liberty/neutron.conf
View File

@ -51,6 +51,8 @@ neutron_firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptable
{% if neutron_plugin == 'Calico' -%}
dhcp_agents_per_network = 1000
{% else -%}
dhcp_agents_per_network = {{ dhcp_agents_per_network }}
{% endif -%}
notify_nova_on_port_status_changes = True

4
unit_tests/test_neutron_api_context.py
View File

@ -284,6 +284,7 @@ class NeutronCCContextTest(CharmTestCase):
self.test_config.set('plumgrid-password', 'plumgrid')
self.test_config.set('plumgrid-virtual-ip', '192.168.100.250')
self.test_config.set('enable-ml2-port-security', True)
self.test_config.set('dhcp-agents-per-network', 3)
def tearDown(self):
super(NeutronCCContextTest, self).tearDown()
@ -297,6 +298,7 @@ class NeutronCCContextTest(CharmTestCase):
'debug': True,
'enable_dvr': False,
'l3_ha': False,
'dhcp_agents_per_network': 3,
'external_network': 'bob',
'neutron_bind_port': self.api_port,
'verbose': True,
@ -331,6 +333,7 @@ class NeutronCCContextTest(CharmTestCase):
'debug': True,
'enable_dvr': False,
'l3_ha': False,
'dhcp_agents_per_network': 3,
'external_network': 'bob',
'neutron_bind_port': self.api_port,
'verbose': True,
@ -376,6 +379,7 @@ class NeutronCCContextTest(CharmTestCase):
'overlay_network_type': 'gre',
'max_l3_agents_per_router': 2,
'min_l3_agents_per_router': 2,
'dhcp_agents_per_network': 3,
'quota_floatingip': 50,
'quota_health_monitors': -1,
'quota_member': -1,