diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-07-08 19:28:32 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-07-08 19:28:32 +0000 |
| commit | 6ebaadb30c3cabaae232f42306903f28627a784c (patch) | |
| tree | bafaed8edbf84845e01653b9cc3c01d6c9401b67 /environments | |
| parent | 82f04ec310fe9d4f99e46077bb1c6e439187c7ed (diff) | |
| parent | e3cd6284fb62a04e0dcb7a144433cf1e27af7fd7 (diff) | |
Merge "Add NeutronExternalNetworkBridge parameter"
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/net-bond-with-vlans.yaml | 6 | ||||
| -rw-r--r-- | environments/net-single-nic-with-vlans.yaml | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/environments/net-bond-with-vlans.yaml b/environments/net-bond-with-vlans.yaml index 38c31cac..73f71324 100644 --- a/environments/net-bond-with-vlans.yaml +++ b/environments/net-bond-with-vlans.yaml @@ -11,3 +11,9 @@ resource_registry: OS::TripleO::Controller::Net::SoftwareConfig: ../network/config/bond-with-vlans/controller.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 + +parameters: + # 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: "''" diff --git a/environments/net-single-nic-with-vlans.yaml b/environments/net-single-nic-with-vlans.yaml index b087b3e4..8561acd3 100644 --- a/environments/net-single-nic-with-vlans.yaml +++ b/environments/net-single-nic-with-vlans.yaml @@ -11,3 +11,9 @@ resource_registry: OS::TripleO::Controller::Net::SoftwareConfig: ../network/config/single-nic-vlans/controller.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 + +parameters: + # 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: "''" |