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-bond-with-vlans-no-external.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-bond-with-vlans-no-external.yaml')
| -rw-r--r-- | environments/net-bond-with-vlans-no-external.yaml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/environments/net-bond-with-vlans-no-external.yaml b/environments/net-bond-with-vlans-no-external.yaml index 75959a0b..cc27d4f0 100644 --- a/environments/net-bond-with-vlans-no-external.yaml +++ b/environments/net-bond-with-vlans-no-external.yaml @@ -20,7 +20,3 @@ resource_registry: OS::TripleO::Controller::Net::SoftwareConfig: ../network/config/bond-with-vlans/controller-no-external.yaml OS::TripleO::ObjectStorage::Net::SoftwareConfig: ../network/config/bond-with-vlans/swift-storage.yaml OS::TripleO::CephStorage::Net::SoftwareConfig: ../network/config/bond-with-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: "''" |