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

@@ -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:

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 %}

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"
 #
 # --------
 #

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:

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:

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:

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
     #

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: