From 1b39f3b8a655a8ad96b02fceddf9d407319b7c88 Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Mon, 9 Apr 2018 15:00:47 +0000 Subject: [PATCH] Use a sensible vlan range in the example configs Change-Id: Idd2c1235e4ff8bd46ae3e5d371c4ecc455bc6234 Closes-Bug: #1761720 --- etc/openstack_deploy/openstack_user_config.yml.aio | 2 +- etc/openstack_deploy/openstack_user_config.yml.aio.j2 | 2 +- etc/openstack_deploy/openstack_user_config.yml.pod.example | 2 +- .../openstack_user_config.yml.prod-ceph.example | 2 +- etc/openstack_deploy/openstack_user_config.yml.prod.example | 2 +- etc/openstack_deploy/openstack_user_config.yml.test.example | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/etc/openstack_deploy/openstack_user_config.yml.aio b/etc/openstack_deploy/openstack_user_config.yml.aio index e02f35d350..e7cccf1a0c 100644 --- a/etc/openstack_deploy/openstack_user_config.yml.aio +++ b/etc/openstack_deploy/openstack_user_config.yml.aio @@ -86,7 +86,7 @@ global_overrides: container_type: "veth" container_interface: "eth11" type: "vlan" - range: "1:1" + range: "101:200,301:400" net_name: "vlan" group_binds: - neutron_linuxbridge_agent diff --git a/etc/openstack_deploy/openstack_user_config.yml.aio.j2 b/etc/openstack_deploy/openstack_user_config.yml.aio.j2 index e49d106f8c..feae934621 100644 --- a/etc/openstack_deploy/openstack_user_config.yml.aio.j2 +++ b/etc/openstack_deploy/openstack_user_config.yml.aio.j2 @@ -98,7 +98,7 @@ global_overrides: container_type: "veth" container_interface: "eth11" type: "vlan" - range: "1:1" + range: "101:200,301:400" net_name: "vlan" group_binds: - neutron_linuxbridge_agent diff --git a/etc/openstack_deploy/openstack_user_config.yml.pod.example b/etc/openstack_deploy/openstack_user_config.yml.pod.example index 04d166768a..31aaeab0b9 100644 --- a/etc/openstack_deploy/openstack_user_config.yml.pod.example +++ b/etc/openstack_deploy/openstack_user_config.yml.pod.example @@ -189,7 +189,7 @@ global_overrides: container_type: "veth" container_interface: "eth11" type: "vlan" - range: "1:1" + range: "101:200,301:400" net_name: "vlan" group_binds: - neutron_linuxbridge_agent diff --git a/etc/openstack_deploy/openstack_user_config.yml.prod-ceph.example b/etc/openstack_deploy/openstack_user_config.yml.prod-ceph.example index 92bba4b06a..de510d0964 100644 --- a/etc/openstack_deploy/openstack_user_config.yml.prod-ceph.example +++ b/etc/openstack_deploy/openstack_user_config.yml.prod-ceph.example @@ -57,7 +57,7 @@ global_overrides: container_type: "veth" container_interface: "eth11" type: "vlan" - range: "1:1" + range: "101:200,301:400" net_name: "vlan" group_binds: - neutron_linuxbridge_agent diff --git a/etc/openstack_deploy/openstack_user_config.yml.prod.example b/etc/openstack_deploy/openstack_user_config.yml.prod.example index 3c16fd75f0..5604c46d6b 100644 --- a/etc/openstack_deploy/openstack_user_config.yml.prod.example +++ b/etc/openstack_deploy/openstack_user_config.yml.prod.example @@ -56,7 +56,7 @@ global_overrides: container_type: "veth" container_interface: "eth11" type: "vlan" - range: "1:1" + range: "101:200,301:400" net_name: "vlan" group_binds: - neutron_linuxbridge_agent diff --git a/etc/openstack_deploy/openstack_user_config.yml.test.example b/etc/openstack_deploy/openstack_user_config.yml.test.example index 435d83f5bd..2e97421f17 100644 --- a/etc/openstack_deploy/openstack_user_config.yml.test.example +++ b/etc/openstack_deploy/openstack_user_config.yml.test.example @@ -52,7 +52,7 @@ global_overrides: container_type: "veth" container_interface: "eth11" type: "vlan" - range: "1:1" + range: "101:200,301:400" net_name: "vlan" group_binds: - neutron_linuxbridge_agent