dhcp-agents-per-network option has no effect in mitaka+

[Nobuto Murata]

dhcp_agents_per_network is lost in mitaka+ templates.

$ git grep -C 1 dhcp_agents_per_network templates/
templates/icehouse/neutron.conf-{% if neutron_plugin == 'Calico' -%}
templates/icehouse/neutron.conf:dhcp_agents_per_network = 1000
templates/icehouse/neutron.conf-{% else -%}
templates/icehouse/neutron.conf:dhcp_agents_per_network = {{ dhcp_agents_per_network }}
templates/icehouse/neutron.conf-{% endif -%}
--
templates/juno/neutron.conf-{% if neutron_plugin == 'Calico' -%}
templates/juno/neutron.conf:dhcp_agents_per_network = 1000
templates/juno/neutron.conf-{% else -%}
templates/juno/neutron.conf:dhcp_agents_per_network = {{ dhcp_agents_per_network }}
templates/juno/neutron.conf-{% endif -%}
--
templates/kilo/neutron.conf-{% if neutron_plugin == 'Calico' -%}
templates/kilo/neutron.conf:dhcp_agents_per_network = 1000
templates/kilo/neutron.conf-{% else -%}
templates/kilo/neutron.conf:dhcp_agents_per_network = {{ dhcp_agents_per_network }}
templates/kilo/neutron.conf-{% endif -%}
--
templates/liberty/neutron.conf-
templates/liberty/neutron.conf:dhcp_agents_per_network = {{ dhcp_agents_per_network }}
templates/liberty/neutron.conf-
--
templates/mitaka/neutron.conf-{% if neutron_plugin == 'Calico' -%}
templates/mitaka/neutron.conf:dhcp_agents_per_network = 1000
templates/mitaka/neutron.conf-{% endif -%}
--
templates/newton/neutron.conf-{% if neutron_plugin == 'Calico' -%}
templates/newton/neutron.conf:dhcp_agents_per_network = 1000
templates/newton/neutron.conf-{% endif -%}

[Nobuto Murata (nobuto)]

https://review.openstack.org/#/c/457872/

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/457872
Committed: https://git.openstack.org/cgit/openstack/charm-neutron-api/commit/?id=bf7d28daadc5cac44c102dcc076c30dbb5feccbb
Submitter: Jenkins
Branch: master

commit bf7d28daadc5cac44c102dcc076c30dbb5feccbb
Author: Nobuto Murata <email address hidden>
Date: Wed Apr 19 14:20:28 2017 +0900

    restore dhcp_agents_per_network

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

    Change-Id: Ide2027ddcb8351bc46fb99b1352eaca569a3121a
    Closes-Bug: 1683987

[Dmitrii Shcherbakov (dmitriis)]

This still needs to be backported into the stable charm versions for Ocata.

[Christian Reis (kiko)]

What was the net effect of this bug?