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/single-nic-linux-bridge-vlans | |
| parent | 2a7e0445187df045d61b6b34b6943a3c6a448308 (diff) | |
| parent | e2e0f9db0cbc995d5504b3931855af85be5b26b7 (diff) | |
Merge "Cleanup some inline comments in network/config"
Diffstat (limited to 'network/config/single-nic-linux-bridge-vlans')
| -rw-r--r-- | network/config/single-nic-linux-bridge-vlans/controller-v6.yaml | 3 | ||||
| -rw-r--r-- | network/config/single-nic-linux-bridge-vlans/controller.yaml | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/network/config/single-nic-linux-bridge-vlans/controller-v6.yaml b/network/config/single-nic-linux-bridge-vlans/controller-v6.yaml index 80125149..a299d23e 100644 --- a/network/config/single-nic-linux-bridge-vlans/controller-v6.yaml +++ b/network/config/single-nic-linux-bridge-vlans/controller-v6.yaml @@ -106,7 +106,6 @@ resources: - ip_netmask: 169.254.169.254/32 next_hop: {get_param: EC2MetadataIp} - # IPv4 Default Route - default: true next_hop: {get_param: ControlPlaneDefaultRoute} @@ -114,7 +113,6 @@ resources: - type: interface name: {get_input: interface_name} - # force the MAC address of the bridge to this interface primary: true - type: vlan @@ -124,7 +122,6 @@ resources: - ip_netmask: {get_param: ExternalIpSubnet} routes: - # IPv6 Default Route - default: true next_hop: {get_param: ExternalInterfaceDefaultRoute} diff --git a/network/config/single-nic-linux-bridge-vlans/controller.yaml b/network/config/single-nic-linux-bridge-vlans/controller.yaml index aef5d4e3..bd97ccb0 100644 --- a/network/config/single-nic-linux-bridge-vlans/controller.yaml +++ b/network/config/single-nic-linux-bridge-vlans/controller.yaml @@ -104,7 +104,6 @@ resources: - ip_netmask: 169.254.169.254/32 next_hop: {get_param: EC2MetadataIp} - # IPv4 Default Route - default: true next_hop: {get_param: ControlPlaneDefaultRoute} @@ -112,7 +111,6 @@ resources: - type: interface name: {get_input: interface_name} - # force the MAC address of the bridge to this interface primary: true - type: vlan @@ -122,7 +120,6 @@ resources: - ip_netmask: {get_param: ExternalIpSubnet} routes: - # IPv6 Default Route - default: true next_hop: {get_param: ExternalInterfaceDefaultRoute} |