diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-02-23 00:06:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-02-23 00:06:28 +0000 |
| commit | 67b14a599689178fbee31068231d636baeacb606 (patch) | |
| tree | 58f590b097f458392969e14f95c3700c2c201f1d /environments/net-single-nic-linux-bridge-with-vlans.yaml | |
| parent | 758eeff854cd40a0e86a584a462bac68715b0548 (diff) | |
| parent | 21d2afd4bf9f57fd0fb3709d87acb452f13912df (diff) | |
Merge "neutron: don't set external_network_bridge option by default"
Diffstat (limited to 'environments/net-single-nic-linux-bridge-with-vlans.yaml')
| -rw-r--r-- | environments/net-single-nic-linux-bridge-with-vlans.yaml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/environments/net-single-nic-linux-bridge-with-vlans.yaml b/environments/net-single-nic-linux-bridge-with-vlans.yaml index fd80bb9b..f34cfb92 100644 --- a/environments/net-single-nic-linux-bridge-with-vlans.yaml +++ b/environments/net-single-nic-linux-bridge-with-vlans.yaml @@ -11,9 +11,3 @@ resource_registry: OS::TripleO::Controller::Net::SoftwareConfig: ../network/config/single-nic-linux-bridge-vlans/controller.yaml OS::TripleO::ObjectStorage::Net::SoftwareConfig: ../network/config/single-nic-linux-bridge-vlans/swift-storage.yaml OS::TripleO::CephStorage::Net::SoftwareConfig: ../network/config/single-nic-linux-bridge-vlans/ceph-storage.yaml - -parameter_defaults: - # This sets 'external_network_bridge' in l3_agent.ini to an empty string - # so that external networks act like provider bridge networks (they - # will plug into br-int instead of br-ex) - NeutronExternalNetworkBridge: "''" |