diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-11-27 19:31:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-11-27 19:31:39 +0000 |
| commit | 597de6ec400d6971f136a770dc01416e81273409 (patch) | |
| tree | 58ebaa76ecbea50eb115aa5026c9acae76def698 /network/config/multiple-nics/controller-v6.yaml | |
| parent | 2a7e0445187df045d61b6b34b6943a3c6a448308 (diff) | |
| parent | e2e0f9db0cbc995d5504b3931855af85be5b26b7 (diff) | |
Merge "Cleanup some inline comments in network/config"
Diffstat (limited to 'network/config/multiple-nics/controller-v6.yaml')
| -rw-r--r-- | network/config/multiple-nics/controller-v6.yaml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/network/config/multiple-nics/controller-v6.yaml b/network/config/multiple-nics/controller-v6.yaml index da1f95f1..bbc89ab6 100644 --- a/network/config/multiple-nics/controller-v6.yaml +++ b/network/config/multiple-nics/controller-v6.yaml @@ -132,7 +132,6 @@ resources: - ip_netmask: {get_param: InternalApiIpSubnet} - - # Create a bridge which can also be used for VLAN-mode bridge mapping type: ovs_bridge name: br-tenant use_dhcp: false @@ -144,7 +143,6 @@ resources: type: interface name: nic5 use_dhcp: false - # force the MAC address of the bridge to this interface primary: true - type: ovs_bridge @@ -155,7 +153,6 @@ resources: - ip_netmask: {get_param: ExternalIpSubnet} routes: - # IPv6 Default Route - default: true next_hop: {get_param: ExternalInterfaceDefaultRoute} @@ -163,7 +160,6 @@ resources: - type: interface name: nic6 - # force the MAC address of the bridge to this interface primary: true # Uncomment when including environments/network-management.yaml # If setting default route on the Management interface, comment |