From 9091752575e2f13d0545577cb0cc67ffb859f3f0 Mon Sep 17 00:00:00 2001 From: Brendan Date: Thu, 26 Nov 2020 11:33:30 +1000 Subject: [PATCH] Remove extra bridge name declaration The extra name: section under the br-tenant bridge, causes the network configuration to fail. This change is removing the unnecessary decalartion, since br-ex is configured later in the same template. closes-bug: 1905640 Change-Id: I51152232fd707a942040e7c9750647b9cdf4f1f1 --- .../templates/multiple_nics/multiple_nics_dvr.j2 | 1 - 1 file changed, 1 deletion(-) diff --git a/tripleo_ansible/roles/tripleo_network_config/templates/multiple_nics/multiple_nics_dvr.j2 b/tripleo_ansible/roles/tripleo_network_config/templates/multiple_nics/multiple_nics_dvr.j2 index 60a18afc1..dd0be22ee 100644 --- a/tripleo_ansible/roles/tripleo_network_config/templates/multiple_nics/multiple_nics_dvr.j2 +++ b/tripleo_ansible/roles/tripleo_network_config/templates/multiple_nics/multiple_nics_dvr.j2 @@ -23,7 +23,6 @@ network_config: {% elif network == 'Tenant' %} - type: ovs_bridge name: {{ 'br-' ~ role_networks_lower[network] }} - name: {{ neutron_physical_bridge_name }} mtu: {{ lookup('vars', role_networks_lower[network] ~ '_mtu') }} dns_servers: {{ ctlplane_dns_nameservers }} use_dhcp: false