aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/hieradata/common.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-15 15:22:03 +0000
committerGerrit Code Review <review@openstack.org>2015-07-15 15:22:03 +0000
commit1ce0f9db531a40e0c3915906a24c002d8ed3eae6 (patch)
tree983b4b768de38d3fa6bbe9c028e8d489952184fe /puppet/hieradata/common.yaml
parent1a1ae9444e275471709aafd2160275411261da83 (diff)
parentbe0d3f3520037c4e2e9fb4f9a235171aaad7e253 (diff)
Merge "Adds the NeutronTunnelIdRanges and NeutronVniRanges parameters"
Diffstat (limited to 'puppet/hieradata/common.yaml')
-rw-r--r--puppet/hieradata/common.yaml6
1 files changed, 1 insertions, 5 deletions
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 40c44aef..7a035435 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -13,10 +13,6 @@ 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::plugins::ml2::type_drivers:
- flat
- gre
@@ -29,4 +25,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