commit fa1bd4ad28d4e7aaec7c2cde29603118d840247a
Author: Alex Schultz <aschultz@redhat.com>
Date:   Thu Oct 1 12:03:33 2020 -0600

    Standalone configure neutron bridge correctly
    
    This change updates the default bridge mapping from datacentre:br-ex to
    datacentre:br-ctlplane. We're doing this because in the standalone in
    CI, we configure a br-ex before running the standalone (via
    undercloud-setup) and want to attach our br-ctlplane to it. We then want
    to ensure that we use br-ctlplane for the neutron access to the external
    network to prevent weird routing issues when we have two bridges on the
    same subnet.
    
    Depends-On: https://review.opendev.org/#/c/757605/
    Change-Id: I0e5aa3f58746dc0b92bd35ade7792f323b5647f7
    Related-Bug: #1895822

diff --git a/roles/standalone-upgrade/README.md b/roles/standalone-upgrade/README.md
index 9812df9..7977065 100644
--- a/roles/standalone-upgrade/README.md
+++ b/roles/standalone-upgrade/README.md
@@ -16,6 +16,8 @@ Role Variables
 - standalone_network_prefix: <'24'> --  The subnet size for the standalone deployment network
 - standalone_ip: <'192.168.24.1'> --  The IP address of the standalone upgrade
 - standalone_interface: <'br-ex'> --  The interface for the standalone upgrade
+- standalone_neutron_bridge_mapping: <'datacentre:br-ctlplane,tenant:br-tenant'> --  The mapping for neutron network bridges
+- standalone_neutron_physical_bridge: <'br-ctlplane'> --  Neutron physical bridge
 
 - standalone_container_prep_options: <''> -- additional parameters for the container prep command
 - standalone_container_prep_script: <'standalone-container-prep.sh.j2'> -- The script name use to perform container prep actions
diff --git a/roles/standalone-upgrade/defaults/main.yml b/roles/standalone-upgrade/defaults/main.yml
index a603f6d..b1c3f88 100644
--- a/roles/standalone-upgrade/defaults/main.yml
+++ b/roles/standalone-upgrade/defaults/main.yml
@@ -5,6 +5,8 @@ standalone_network_prefix: 24
 standalone_ip: 192.168.24.1
 standalone_ha_control_virtual_ip: 192.168.24.3
 standalone_interface: br-ex
+standalone_neutron_bridge_mappings: "datacentre:br-ctlplane,tenant:br-tenant"
+standalone_neutron_physical_bridge: br-ctlplane
 
 # container prep script
 standalone_container_prep_options: ''
diff --git a/roles/standalone-upgrade/templates/standalone_config.yaml.j2 b/roles/standalone-upgrade/templates/standalone_config.yaml.j2
index dd27780..ef48580 100644
--- a/roles/standalone-upgrade/templates/standalone_config.yaml.j2
+++ b/roles/standalone-upgrade/templates/standalone_config.yaml.j2
@@ -19,6 +19,12 @@ parameter_defaults:
     {{ standalone_network }}.0/{{ standalone_network_prefix }}:
     - {{ standalone_network }}.0/{{ standalone_network_prefix }}
   NeutronPublicInterface: {{ standalone_interface }}
+{% if standalone_neutron_bridge_mappings is defined and standalone_neutron_bridge_mappings %}
+  NeutronBridgeMappings: {{ standalone_neutron_bridge_mappings }}
+{% endif %}
+{% if standalone_neutron_physical_bridge is defined and standalone_neutron_physical_bridge %}
+  NeutronPhysicalBridge: {{ standalone_neutron_physical_bridge }}
+{% endif %}
   StandaloneCtlplaneLocalSubnet: ctlplane-subnet
   StandaloneCtlplaneSubnets:
     ctlplane-subnet:
diff --git a/roles/standalone/README.md b/roles/standalone/README.md
index 9ce77fc..3a952b3 100644
--- a/roles/standalone/README.md
+++ b/roles/standalone/README.md
@@ -17,6 +17,9 @@ Role Variables
 - standalone_network_prefix: <'24'> --  The subnet size for the standalone deployment network
 - standalone_ip: <'192.168.24.1'> --  The IP address of the standalone deployment
 - standalone_interface: <'br-ex'> --  The interface for the standalone deployment
+- standalone_neutron_bridge_mapping: <'datacentre:br-ctlplane,tenant:br-tenant'> --  The mapping for neutron network bridges
+- standalone_neutron_physical_bridge: <'br-ctlplane'> --  Neutron physical bridge
+
 - standalone_hostname: <'standalone.localdomain'> -- FQDN to use for the system being deployed. Must be a fully qualified hostname with the domain.
 
 - standalone_container_prep_options: <''> -- additional parameters for the container prep command
diff --git a/roles/standalone/defaults/main.yml b/roles/standalone/defaults/main.yml
index 872d018..cbd322c 100644
--- a/roles/standalone/defaults/main.yml
+++ b/roles/standalone/defaults/main.yml
@@ -5,6 +5,8 @@ standalone_network_prefix: 24
 standalone_ip: 192.168.24.1
 standalone_ha_control_virtual_ip: 192.168.24.3
 standalone_interface: br-ex
+standalone_neutron_bridge_mappings: "datacentre:br-ctlplane,tenant:br-tenant"
+standalone_neutron_physical_bridge: br-ctlplane
 standalone_hostname: standalone.localdomain
 
 # container prep script
diff --git a/roles/standalone/templates/standalone_config.yaml.j2 b/roles/standalone/templates/standalone_config.yaml.j2
index b9cbce9..3ae7ac5 100644
--- a/roles/standalone/templates/standalone_config.yaml.j2
+++ b/roles/standalone/templates/standalone_config.yaml.j2
@@ -30,6 +30,9 @@ parameter_defaults:
 {% if standalone_neutron_bridge_mappings is defined and standalone_neutron_bridge_mappings %}
   NeutronBridgeMappings: {{ standalone_neutron_bridge_mappings }}
 {% endif %}
+{% if standalone_neutron_physical_bridge is defined and standalone_neutron_physical_bridge %}
+  NeutronPhysicalBridge: {{ standalone_neutron_physical_bridge }}
+{% endif %}
   StandaloneCtlplaneLocalSubnet: ctlplane-subnet
   StandaloneCtlplaneSubnets:
     ctlplane-subnet: