summaryrefslogtreecommitdiffstats
path: root/puppet/hieradata
diff options
context:
space:
mode:
authormarios <marios@redhat.com>2015-07-07 15:11:02 +0300
committermarios <marios@redhat.com>2015-07-09 13:46:09 +0300
commit7614af59ce211b6afc31790489b4104067050522 (patch)
tree1c6d765e9e1cfd490cb044befc4dcb1231874643 /puppet/hieradata
parent0405a6b248a8328edc1ca050be7e33f436b29c77 (diff)
Adds the NeutronDhcpAgentsPerNetwork parameter
Currently for both puppet and image-elements based deploys we set the dhcp_agents_per_network in neutron.conf to 2 and there is no control over that number (in the hieradata for the former and the image element for the latter). This change adds the NeutronDhcpAgentsPerNetwork parameter and also changes the default to 3 when not explicitly set. In the puppet case propagate this parameter in the hieradata for the neutron class and in the non-puppet case expose a new item in the neutron config to be consumed by the neutron image element (that change will point here) Change-Id: Id97c7796db7231b636f2001e28412452cf89562b
Diffstat (limited to 'puppet/hieradata')
-rw-r--r--puppet/hieradata/controller.yaml1
1 files changed, 0 insertions, 1 deletions
diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index cdd1d3ae..72c10c26 100644
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -65,7 +65,6 @@ glance::backend::rbd::rbd_store_user: 'openstack'
neutron::core_plugin: 'ml2'
neutron::service_plugins:
- 'neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'
-neutron::dhcp_agents_per_network: 2
neutron::server::sync_db: true
neutron::agents::dhcp::dnsmasq_config_file: /etc/neutron/dnsmasq-neutron.conf