commit aa3650e6b97582aa91018a38ebe8738b144a0523
Author: Alex Schultz <aschultz@redhat.com>
Date:   Mon Oct 12 09:44:19 2020 -0600

    Change network on standalone network bridge configuration
    
    We're hitting issues with the network being configured in the CI as part
    of the muilti-node-bridge setup task and our standalone deployments.
    This change updates the br-ex created as part of the multi-node-bridge
    role to use 172.16.1.0/24 instead of overlapping with the
    192.168.24.0/24 that we configure as part of the standalone deployment.
    
    Change-Id: I46758fe75d52c5e848750e749e11ad89433f563a
    Related-Bug: #1895822

diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index 74573d1..b811057 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -325,6 +325,16 @@
     parent: tripleo-ci-base
     nodeset: single-centos-7-node
     vars:
+      # for standalone we don't need the multinode network configuration but
+      # we do want the interface to be created. So let's create br-ex but
+      # configure it with a different network than what we use for standalone.
+      # any jobs that need this network configuration for multinode need to
+      # adjust their configuration to us 172.16.1.0/24
+      bridge_name: br-ex
+      bridge_address_prefix: 172.16.1
+      bridge_address_subnet: 24
+      bridge_address_offset: 2
+      bridge_mtu: 1350
       undercloud: 127.0.0.2
       environment_infra: osinfra
       environment_type: standalone
@@ -383,6 +393,16 @@
     nodeset: single-centos-8-node
     pre-run: playbooks/tripleo-ci/install-built-repo.yml
     vars:
+      # for standalone we don't need the multinode network configuration but
+      # we do want the interface to be created. So let's create br-ex but
+      # configure it with a different network than what we use for standalone.
+      # any jobs that need this network configuration for multinode need to
+      # adjust their configuration to us 172.16.1.0/24
+      bridge_name: br-ex
+      bridge_address_prefix: 172.16.1
+      bridge_address_subnet: 24
+      bridge_address_offset: 2
+      bridge_mtu: 1350
       undercloud: 127.0.0.2
       environment_infra: osinfra
       environment_type: standalone
@@ -404,6 +424,16 @@
     nodeset: single-centos-7-node
     vars:
       undercloud: 127.0.0.2
+      # for standalone we don't need the multinode network configuration but
+      # we do want the interface to be created. So let's create br-ex but
+      # configure it with a different network than what we use for standalone.
+      # any jobs that need this network configuration for multinode need to
+      # adjust their configuration to us 172.16.1.0/24
+      bridge_name: br-ex
+      bridge_address_prefix: 172.16.1
+      bridge_address_subnet: 24
+      bridge_address_offset: 2
+      bridge_mtu: 1350
       environment_infra: osinfra
       environment_type: standalone
       common_featureset: featureset-multinode-common.yml
@@ -427,6 +457,16 @@
     nodeset: single-centos-8-node
     vars:
       undercloud: 127.0.0.2
+      # for standalone we don't need the multinode network configuration but
+      # we do want the interface to be created. So let's create br-ex but
+      # configure it with a different network than what we use for standalone.
+      # any jobs that need this network configuration for multinode need to
+      # adjust their configuration to us 172.16.1.0/24
+      bridge_name: br-ex
+      bridge_address_prefix: 172.16.1
+      bridge_address_subnet: 24
+      bridge_address_offset: 2
+      bridge_mtu: 1350
       environment_infra: osinfra
       environment_type: standalone
       common_featureset: featureset-multinode-common.yml