Set VXLAN tunnels range to match GRE range

Change-Id: I16d259055fe4cd22541cd7abd7a26c71bbbaf292

diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index c15d43e..5901a9c 100644 (file)
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -13,6 +13,11 @@ 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'
+
 sysctl_settings:
   net.ipv4.tcp_keepalive_intvl:
     value: 1

diff --git a/puppet/hieradata/compute.yaml b/puppet/hieradata/compute.yaml
index a72c485..4915d3c 100644 (file)
--- a/puppet/hieradata/compute.yaml
+++ b/puppet/hieradata/compute.yaml
@@ -15,6 +15,4 @@ nova::compute::rbd::rbd_keyring: 'client.openstack'
 nova::compute::rbd::libvirt_images_rbd_pool: 'vms'
 nova::compute::rbd::libvirt_rbd_secret_uuid: "%{hiera('ceph::profile::params::fsid')}"
 
-neutron::plugins::ml2::tunnel_id_ranges: ['1:1000']
-
 ceilometer::agent::auth::auth_tenant_name: 'service'

diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index 4f46c7f..4a50623 100644 (file)
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -67,8 +67,6 @@ neutron::core_plugin: 'ml2'
 neutron::service_plugins:
   - 'neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'
 neutron::dhcp_agents_per_network: 2
-neutron::plugins::ml2::tunnel_id_ranges:
-  - '1:1000'
 neutron::server::sync_db: true
 neutron::agents::dhcp::dnsmasq_config_file: /etc/neutron/dnsmasq-neutron.conf