Merge "Allow overlapping IPs in Neutron"

[apex-tripleo-heat-templates.git] / puppet / hieradata / common.yaml

diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index c15d43e..272a668 100644 (file)
--- 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