Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw (from parent 2: ff33f2a)
Merge "Allow the deployer to pick a predefined IP for VIPs"
authorJenkins <jenkins@review.openstack.org>
Thu, 4 Feb 2016 14:24:24 +0000 (14:24 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 4 Feb 2016 14:24:24 +0000 (14:24 +0000)
puppet/hieradata/controller.yaml patch | blob | history

diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index f8ef640..06be40e 100644 (file)
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -34,6 +34,8 @@ glance::api::keystone_tenant: 'service'
 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'