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

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.

config.yaml

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

hooks/neutron_api_context.py

@@ -174,7 +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['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']:

unit_tests/test_neutron_api_context.py

@@ -298,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,
@@ -332,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,