diff --git a/network/config/bond-with-vlans/networker.yaml b/network/config/bond-with-vlans/networker.yaml index 45994c72e8..967eb6fdc9 100644 --- a/network/config/bond-with-vlans/networker.yaml +++ b/network/config/bond-with-vlans/networker.yaml @@ -111,6 +111,9 @@ resources: - ip_netmask: 169.254.169.254/32 next_hop: get_param: EC2MetadataIp + - default: true + next_hop: + get_param: ControlPlaneDefaultRoute - type: ovs_bridge name: bridge_name dns_servers: @@ -126,17 +129,6 @@ resources: primary: true - type: interface name: nic3 - - type: vlan - device: bond1 - vlan_id: - get_param: ExternalNetworkVlanID - addresses: - - ip_netmask: - get_param: ExternalIpSubnet - routes: - - default: true - next_hop: - get_param: ExternalInterfaceDefaultRoute - type: vlan device: bond1 vlan_id: diff --git a/network/config/multiple-nics/networker.yaml b/network/config/multiple-nics/networker.yaml index abee66ca0e..7b7561addc 100644 --- a/network/config/multiple-nics/networker.yaml +++ b/network/config/multiple-nics/networker.yaml @@ -103,6 +103,9 @@ resources: - ip_netmask: 169.254.169.254/32 next_hop: get_param: EC2MetadataIp + - default: true + next_hop: + get_param: ControlPlaneDefaultRoute - type: interface name: nic4 use_dhcp: false @@ -122,24 +125,14 @@ resources: primary: true - type: ovs_bridge name: bridge_name - dns_servers: - get_param: DnsServers use_dhcp: false - addresses: - - ip_netmask: - get_param: ExternalIpSubnet - routes: - - default: true - next_hop: - get_param: ExternalInterfaceDefaultRoute members: - type: interface name: nic6 primary: true # Uncomment when including environments/network-management.yaml # If setting default route on the Management interface, comment - # out the default route on the External interface. This will - # make the External API unreachable from remote subnets. + # out the default route on the Control Plane interface. #- # type: interface # name: nic7 diff --git a/network/config/single-nic-linux-bridge-vlans/networker.yaml b/network/config/single-nic-linux-bridge-vlans/networker.yaml index 7dd48944cb..0ac921350b 100644 --- a/network/config/single-nic-linux-bridge-vlans/networker.yaml +++ b/network/config/single-nic-linux-bridge-vlans/networker.yaml @@ -112,17 +112,6 @@ resources: # default is "nic1". Set this value via parameter_defaults in an environment file. name: interface_name primary: true - - type: vlan - vlan_id: - get_param: ExternalNetworkVlanID - device: bridge_name - addresses: - - ip_netmask: - get_param: ExternalIpSubnet - routes: - - default: true - next_hop: - get_param: ExternalInterfaceDefaultRoute - type: vlan vlan_id: get_param: InternalApiNetworkVlanID @@ -139,8 +128,7 @@ resources: get_param: TenantIpSubnet # Uncomment when including environments/network-management.yaml # If setting default route on the Management interface, comment - # out the default route on the External interface. This will - # make the External API unreachable from remote subnets. + # out the default route on the Control Plane interface. #- # type: vlan # vlan_id: {get_param: ManagementNetworkVlanID} diff --git a/network/config/single-nic-vlans/networker.yaml b/network/config/single-nic-vlans/networker.yaml index 2502984a8c..7eb07524be 100644 --- a/network/config/single-nic-vlans/networker.yaml +++ b/network/config/single-nic-vlans/networker.yaml @@ -103,21 +103,14 @@ resources: - ip_netmask: 169.254.169.254/32 next_hop: get_param: EC2MetadataIp + - default: true + next_hop: + get_param: ControlPlaneDefaultRoute members: - type: interface name: nic1 # force the MAC address of the bridge to this interface primary: true - - type: vlan - vlan_id: - get_param: ExternalNetworkVlanID - addresses: - - ip_netmask: - get_param: ExternalIpSubnet - routes: - - default: true - next_hop: - get_param: ExternalInterfaceDefaultRoute - type: vlan vlan_id: get_param: InternalApiNetworkVlanID @@ -132,8 +125,7 @@ resources: get_param: TenantIpSubnet # Uncomment when including environments/network-management.yaml # If setting default route on the Management interface, comment - # out the default route on the External interface. This will - # make the External API unreachable from remote subnets. + # out the default route on the Control Plane interface. #- # type: vlan # vlan_id: {get_param: ManagementNetworkVlanID}