openstack/charm-neutron-api
Code Issues Proposed changes

restore dhcp_agents_per_network

Browse Source 
According to the commit 892db0dbd799f513a27e6186790ec74b3ada4cd3, it
looks like neutron_plugin=='Calico' guard is no longer needed for
Liberty+.

Change-Id: Ide2027ddcb8351bc46fb99b1352eaca569a3121a
Closes-Bug: 1683987
This commit is contained in:
Nobuto Murata 2017-04-19 14:20:28 +09:00
parent 4a99be6bf6
commit bf7d28daad
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/mitaka/neutron.conf
View File

@ -50,9 +50,7 @@ neutron_firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptable
{% endif -%}
{% endif -%}
{% if neutron_plugin == 'Calico' -%}
dhcp_agents_per_network = 1000
{% endif -%}
dhcp_agents_per_network = {{ dhcp_agents_per_network }}
notify_nova_on_port_status_changes = True
notify_nova_on_port_data_changes = True

4
templates/newton/neutron.conf
View File

@ -50,9 +50,7 @@ neutron_firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptable
{% endif -%}
{% endif -%}
{% if neutron_plugin == 'Calico' -%}
dhcp_agents_per_network = 1000
{% endif -%}
dhcp_agents_per_network = {{ dhcp_agents_per_network }}
notify_nova_on_port_status_changes = True
notify_nova_on_port_data_changes = True