openstack/tripleo-heat-templates
Code Issues Proposed changes

Remove deprecated NeutronExternalNetworkBridge from CI environments

Browse Source 
This change removes the NeutronExternalNetworkBridge parameter from
the CI environment files, since the default value is now the same
as the value in the environment files, and it will be removed
entirely as it is deprecated.

Change-Id: Ia1b879f33fcd8d6eae149feb4dc1d362aa341cce
This commit is contained in:
Dan Sneddon 2018-04-30 17:20:50 -07:00
parent 7952d2e53a
commit 6141e35477
3 changed files with 0 additions and 3 deletions
ci/environments/network
multiple-nics-ipv6
network-environment.yaml
multiple-nics
network-environment.yaml
public-bond
network-environment.yaml

1
ci/environments/network/multiple-nics-ipv6/network-environment.yaml

@ -13,7 +13,6 @@ parameter_defaults:
ExternalNetCidr: 2001:db8:fd00:1000::/64
ExternalAllocationPools: [{"start": "2001:db8:fd00:1000::10", "end": "2001:db8:fd00:1000:ffff:ffff:ffff:fffe"}]
ExternalInterfaceDefaultRoute: 2001:db8:fd00:1000::1
NeutronExternalNetworkBridge: "''"
InternalApiNetCidr: fd00:fd00:fd00:2000::/64
InternalApiAllocationPools: [{"start": "fd00:fd00:fd00:2000::10", "end": "fd00:fd00:fd00:2000:ffff:ffff:ffff:fffe"}]
StorageNetCidr: fd00:fd00:fd00:3000::/64

1
ci/environments/network/multiple-nics/network-environment.yaml

@ -14,7 +14,6 @@ parameter_defaults:
ExternalAllocationPools: [{"start": "10.0.0.10", "end": "10.0.0.50"}]
ExternalInterfaceDefaultRoute: 10.0.0.1
PublicVirtualFixedIPs: [{ "ip_address": "10.0.0.5" }]
NeutronExternalNetworkBridge: "''"
InternalApiNetCidr: 172.17.0.0/24
InternalApiAllocationPools: [{"start": "172.17.0.10", "end": "172.17.0.250"}]
StorageNetCidr: 172.18.0.0/24

1
ci/environments/network/public-bond/network-environment.yaml

@ -13,7 +13,6 @@ parameter_defaults:
ExternalNetCidr: 10.0.0.0/24
ExternalAllocationPools: [{"start": "10.0.0.10", "end": "10.0.0.50"}]
ExternalInterfaceDefaultRoute: 10.0.0.1
NeutronExternalNetworkBridge: "''"
InternalApiNetCidr: 172.17.0.0/24
InternalApiAllocationPools: [{"start": "172.17.0.10", "end": "172.17.0.250"}]
StorageNetCidr: 172.18.0.0/24