aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-04-29 20:08:27 +0000
committerGerrit Code Review <review@openstack.org>2015-04-29 20:08:27 +0000
commitad0f3a3e44adad1bd8aaaa580197e3c68f327388 (patch)
tree9b212833f4e082815caf2b4eb4d20f54bb6ff814
parent8a41ac5d7352c9f88b4930f6af469bc928fb9201 (diff)
parent6b08c07045382308590698427994430fa9ac5502 (diff)
Merge "Disable dhcp_domain in Nova for the overcloud as well"
-rw-r--r--puppet/hieradata/common.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index b468aa13..b7fb84ab 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -11,3 +11,4 @@ nova::network::neutron::neutron_admin_tenant_name: 'service'
nova::network::neutron::neutron_admin_username: 'neutron'
nova::network::neutron::vif_plugging_is_fatal: false
nova::network::neutron::vif_plugging_timeout: 30
+nova::network::neutron::dhcp_domain: ''