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-with-vlans-no-external.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-with-vlans-no-external.yaml')
-rw-r--r-- | environments/net-single-nic-with-vlans-no-external.yaml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/environments/net-single-nic-with-vlans-no-external.yaml b/environments/net-single-nic-with-vlans-no-external.yaml index c7594b32..65d38137 100644 --- a/environments/net-single-nic-with-vlans-no-external.yaml +++ b/environments/net-single-nic-with-vlans-no-external.yaml @@ -19,7 +19,3 @@ resource_registry: OS::TripleO::Controller::Net::SoftwareConfig: ../network/config/single-nic-vlans/controller-no-external.yaml OS::TripleO::ObjectStorage::Net::SoftwareConfig: ../network/config/single-nic-vlans/swift-storage.yaml OS::TripleO::CephStorage::Net::SoftwareConfig: ../network/config/single-nic-vlans/ceph-storage.yaml - -# NOTE: with no external interface we should be able to use the -# default Neutron l3_agent.ini setting for the external bridge (br-ex) -# i.e. No need to set: NeutronExternalNetworkBridge: "''" |