X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fhieradata%2Fcommon.yaml;h=272a6688aa992bbda834094e5fd697d39c7f0927;hb=3fe8be130bea172cdeab5d20115bfa550de92f24;hp=c15d43eab276b37825833e4c59a3310f9dc311d0;hpb=8bdb82deb9423d1f7de2b479f97f92fb66ab3c81;p=apex-tripleo-heat-templates.git

diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index c15d43ea..272a6688 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -13,10 +13,17 @@ 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
+  - vxlan
+  - vlan
+
 sysctl_settings:
   net.ipv4.tcp_keepalive_intvl:
     value: 1
   net.ipv4.tcp_keepalive_probes:
     value: 5
   net.ipv4.tcp_keepalive_time:
-    value: 5
\ No newline at end of file
+    value: 5