From f07ca38a82c659988d4630f9e5ce87da474a861d Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Tue, 13 Oct 2020 09:42:28 -0600 Subject: [PATCH] Don't manage bridge mappings in scenario file The bridge mappings should be managed in the standalone parameters. This bridge mapping prevents us from being able to change the datacentre mapping in CI. Change-Id: I6b5b9db75a11c2347720258a39b03aa28702dbf1 Related-Bug: #1895822 (cherry picked from commit c86fa4fb4ee6f4bf86252ca3e1fde25fa55c3677) --- ci/environments/scenario012-standalone.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/environments/scenario012-standalone.yaml b/ci/environments/scenario012-standalone.yaml index 9f631d7c2d..22ecf236a0 100644 --- a/ci/environments/scenario012-standalone.yaml +++ b/ci/environments/scenario012-standalone.yaml @@ -32,4 +32,3 @@ parameter_defaults: NeutronFlatNetworks: datacentre NeutronNetworkVLANRanges: 'datacentre:500:599,tenant:300:399' ML2HostConfigs: { "net-ans-br": { "ansible_network_os": "openvswitch", "ansible_host": "127.0.0.1", "ansible_user": "root", "ansible_ssh_private_key_file": "/etc/puppet/ci-key"}} - NeutronBridgeMappings: 'datacentre:br-ex,tenant:br-tenant'