Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
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
40c44ae
..
272a668
100644
(file)
--- a/
puppet/hieradata/common.yaml
+++ b/
puppet/hieradata/common.yaml
@@
-13,10
+13,7
@@
nova::network::neutron::vif_plugging_is_fatal: false
nova::network::neutron::vif_plugging_timeout: 30
nova::network::neutron::dhcp_domain: ''
nova::network::neutron::vif_plugging_timeout: 30
nova::network::neutron::dhcp_domain: ''
-neutron::plugins::ml2::tunnel_id_ranges:
- - '1:1000'
-neutron::plugins::ml2::vni_ranges:
- - '1:1000'
+neutron::allow_overlapping_ips: true
neutron::plugins::ml2::type_drivers:
- flat
- gre
neutron::plugins::ml2::type_drivers:
- flat
- gre
@@
-29,4
+26,4
@@
sysctl_settings:
net.ipv4.tcp_keepalive_probes:
value: 5
net.ipv4.tcp_keepalive_time:
net.ipv4.tcp_keepalive_probes:
value: 5
net.ipv4.tcp_keepalive_time:
- value: 5
\ No newline at end of file
+ value: 5