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/network-environment.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/network-environment.yaml')
| -rw-r--r-- | environments/network-environment.yaml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/environments/network-environment.yaml b/environments/network-environment.yaml index 796eb806..210b6b03 100644 --- a/environments/network-environment.yaml +++ b/environments/network-environment.yaml @@ -48,8 +48,6 @@ parameter_defaults: # ManagementInterfaceDefaultRoute: 10.0.1.1 # Define the DNS servers (maximum 2) for the overcloud nodes DnsServers: ["8.8.8.8","8.8.4.4"] - # Set to empty string to enable multiple external networks or VLANs - NeutronExternalNetworkBridge: "''" # List of Neutron network types for tenant networks (will be used in order) NeutronNetworkType: 'vxlan,vlan' # The tunnel type for the tenant network (vxlan or gre). Set to '' to disable tunneling. |