diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-03-02 05:12:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-03-02 05:12:41 +0000 |
| commit | 74a99e72828c2bda46c856fc4983ad1ae1a4472f (patch) | |
| tree | a3288b8285a325c8bb30902989a9a9f752110a68 /environments/net-single-nic-linux-bridge-with-vlans.yaml | |
| parent | 6bda18b16af5004e9d34a583806bc80b0554b188 (diff) | |
| parent | fd3ac00879b4456564711c6599f5542602641b33 (diff) | |
Merge "neutron: don't set external_network_bridge option by default" into stable/ocata
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: "''" |