From: Jiri Stransky <jistr@redhat.com>
Date: Fri, 17 Jul 2015 12:56:21 +0000 (+0200)
Subject: Allow overlapping IPs in Neutron
X-Git-Tag: opnfv-6.0.0~2431^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=4bd9920b972c06615a26331ae19a560118519f5f;p=apex-tripleo-heat-templates.git

Allow overlapping IPs in Neutron

Change-Id: I7703013b62bd67869c268fb8689389ec0eeb5aad
---

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