summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-20 07:20:11 +0000
committerGerrit Code Review <review@openstack.org>2015-07-20 07:20:11 +0000
commit3fe8be130bea172cdeab5d20115bfa550de92f24 (patch)
tree1d5ab478b4420312c960292c9619bcb92305c9e1 /puppet
parent04e1f75910fde44d07465ade327e61ce6238e1a9 (diff)
parent4bd9920b972c06615a26331ae19a560118519f5f (diff)
Merge "Allow overlapping IPs in Neutron"
Diffstat (limited to 'puppet')
-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 7a035435..272a6688 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -13,6 +13,7 @@ nova::network::neutron::vif_plugging_is_fatal: false
nova::network::neutron::vif_plugging_timeout: 30
nova::network::neutron::dhcp_domain: ''
+neutron::allow_overlapping_ips: true
neutron::plugins::ml2::type_drivers:
- flat
- gre