diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-05-11 12:48:35 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-05-11 12:48:35 +0000 |
| commit | 0d3dacec4b63fb168f4f039501dc6e7b9622315b (patch) | |
| tree | 7a4d9deadd321757a8153c4e649b09585e273d68 /puppet/hieradata | |
| parent | c2cd6f01dc18901a33bd04ffe71ef00613fc3744 (diff) | |
| parent | 27f7d220bd5a9d0a1deebe16dd1d6a3dee11af82 (diff) | |
Merge "composable neutron dhcp service"
Diffstat (limited to 'puppet/hieradata')
| -rw-r--r-- | puppet/hieradata/controller.yaml | 2 |
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' |