aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/hieradata
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2016-04-08 08:42:02 -0400
committerDan Prince <dprince@redhat.com>2016-05-10 21:52:01 -0400
commit27f7d220bd5a9d0a1deebe16dd1d6a3dee11af82 (patch)
tree45573a43ddba13e157ec4e89a834f8840fa3f9ec /puppet/hieradata
parentd76f70edcd3bbf0308071638cb4ee8eb2f70503a (diff)
composable neutron dhcp service
Adds new puppet and puppet pacemaker specific services for the Neutron DHCP agent. Depends-On: Ibbfd79421f871e41f870745a593cca65e8c0e58a Partially-implements: blueprint composable-services-within-roles Change-Id: Ia61295943e67efe354a51a26fe4540f288ff6ede
Diffstat (limited to 'puppet/hieradata')
-rw-r--r--puppet/hieradata/controller.yaml2
1 files changed, 0 insertions, 2 deletions
diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index b662bc64..416233ce 100644
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -50,7 +50,6 @@ glance::registry::keystone_tenant: 'service'
neutron::server::auth_tenant: 'service'
neutron::agents::metadata::auth_tenant: 'service'
neutron::agents::l3::router_delete_namespaces: True
-neutron::agents::dhcp::dhcp_delete_namespaces: True
cinder::api::keystone_tenant: 'service'
swift::proxy::authtoken::admin_tenant_name: 'service'
ceilometer::api::keystone_tenant: 'service'
@@ -110,7 +109,6 @@ glance_file_pcmk_directory: '/var/lib/glance/images'
# neutron
neutron::server::sync_db: true
-neutron::agents::dhcp::dnsmasq_config_file: /etc/neutron/dnsmasq-neutron.conf
# nova
nova::notify_on_state_change: 'vm_and_task_state'