From 52e02439ca12b338b2a45d431947188c0f7fc453 Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Wed, 13 Mar 2024 13:12:35 +0000 Subject: [PATCH] Fix physical network mapping for linuxbridge The same physical network label cannot be used more than once with Linuxbridge. This patch standardises the label physnet1 for the flat public network and instead uses physnet2 for the vlan project networks for Linuxbridge. Change-Id: Ie42b995c93e081d484fc177fb665802950335c50 --- etc/openstack_deploy/openstack_user_config.yml.aio | 2 +- etc/openstack_deploy/openstack_user_config.yml.aio.j2 | 4 +++- etc/openstack_deploy/openstack_user_config.yml.example | 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 +- .../openstack_user_config.yml.provnet-group.example | 2 +- etc/openstack_deploy/openstack_user_config.yml.test.example | 2 +- 8 files changed, 10 insertions(+), 8 deletions(-) diff --git a/etc/openstack_deploy/openstack_user_config.yml.aio b/etc/openstack_deploy/openstack_user_config.yml.aio index ffb8aafb3f..1b3c44cabc 100644 --- a/etc/openstack_deploy/openstack_user_config.yml.aio +++ b/etc/openstack_deploy/openstack_user_config.yml.aio @@ -106,7 +106,7 @@ global_overrides: container_interface: "eth11" type: "vlan" range: "101:200,301:400" - net_name: "physnet1" + net_name: "physnet2" group_binds: - neutron_linuxbridge_agent - network: diff --git a/etc/openstack_deploy/openstack_user_config.yml.aio.j2 b/etc/openstack_deploy/openstack_user_config.yml.aio.j2 index d1da920261..fb21b5a3ee 100644 --- a/etc/openstack_deploy/openstack_user_config.yml.aio.j2 +++ b/etc/openstack_deploy/openstack_user_config.yml.aio.j2 @@ -162,6 +162,7 @@ global_overrides: container_interface: "eth12" host_bind_override: "eth12" type: "flat" + # ensure that public network is consistently physnet1 between OVS / OVN and Linuxbridge net_name: "physnet1" group_binds: - neutron_linuxbridge_agent @@ -171,7 +172,8 @@ global_overrides: container_interface: "eth11" type: "vlan" range: "101:200,301:400" - net_name: "physnet1" + # special case for project networks - cannot re-use the physnet1 label with Linuxbridge + net_name: "physnet2" group_binds: - neutron_linuxbridge_agent {% else %} diff --git a/etc/openstack_deploy/openstack_user_config.yml.example b/etc/openstack_deploy/openstack_user_config.yml.example index bfdb77aa45..1c00457fd3 100644 --- a/etc/openstack_deploy/openstack_user_config.yml.example +++ b/etc/openstack_deploy/openstack_user_config.yml.example @@ -295,7 +295,7 @@ # container_interface: "eth12" # host_bind_override: "eth12" # type: "flat" -# net_name: "physnet1" +# net_name: "physnet2" # # -------- # diff --git a/etc/openstack_deploy/openstack_user_config.yml.pod.example b/etc/openstack_deploy/openstack_user_config.yml.pod.example index 6baafa6c26..1f640b0af4 100644 --- a/etc/openstack_deploy/openstack_user_config.yml.pod.example +++ b/etc/openstack_deploy/openstack_user_config.yml.pod.example @@ -181,7 +181,7 @@ global_overrides: container_interface: "eth12" host_bind_override: "eth12" type: "flat" - net_name: "physnet1" + net_name: "physnet2" group_binds: - neutron_linuxbridge_agent - network: 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 8f90108a62..405957365c 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_interface: "eth11" type: "vlan" range: "101:200,301:400" - net_name: "physnet1" + net_name: "physnet2" group_binds: - neutron_linuxbridge_agent - network: diff --git a/etc/openstack_deploy/openstack_user_config.yml.prod.example b/etc/openstack_deploy/openstack_user_config.yml.prod.example index 7c8d96f3fa..b44b6dcf8a 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_interface: "eth11" type: "vlan" range: "101:200,301:400" - net_name: "physnet1" + net_name: "physnet2" group_binds: - neutron_linuxbridge_agent - network: diff --git a/etc/openstack_deploy/openstack_user_config.yml.provnet-group.example b/etc/openstack_deploy/openstack_user_config.yml.provnet-group.example index d80e9c04f8..47abe1ad92 100644 --- a/etc/openstack_deploy/openstack_user_config.yml.provnet-group.example +++ b/etc/openstack_deploy/openstack_user_config.yml.provnet-group.example @@ -81,7 +81,7 @@ global_overrides: host_bind_override: "ens1f0" type: "vlan" range: "101:200,301:400" - net_name: "physnet1" + net_name: "physnet2" group_binds: - network_hosts # diff --git a/etc/openstack_deploy/openstack_user_config.yml.test.example b/etc/openstack_deploy/openstack_user_config.yml.test.example index 0f13d0e982..6917928c3b 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_interface: "eth11" type: "vlan" range: "101:200,301:400" - net_name: "physnet1" + net_name: "physnet2" group_binds: - neutron_linuxbridge_agent - network: