X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fhieradata%2Fcommon.yaml;h=272a6688aa992bbda834094e5fd697d39c7f0927;hb=3fe8be130bea172cdeab5d20115bfa550de92f24;hp=40c44aefc0647ee6eada55ae95801cd699f71a9c;hpb=d1c93052959457f1f93d2a5e6aca7db666dc64b8;p=apex-tripleo-heat-templates.git diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml index 40c44aef..272a6688 100644 --- 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: '' -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 @@ -29,4 +26,4 @@ sysctl_settings: net.ipv4.tcp_keepalive_probes: value: 5 net.ipv4.tcp_keepalive_time: - value: 5 \ No newline at end of file + value: 5