Merge "Add ctlplane interface routes"

ci/common/net-config-multinode-os-net-config.yaml

@@ -20,6 +20,14 @@ parameters:
     description: The default route of the control plane network. (The parameter
       is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
     type: string
+  ControlPlaneStaticRoutes:
+    default: []
+    description: >
+      Routes for the ctlplane network traffic.
+      JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+      Unless the default is changed, the parameter is automatically resolved
+      from the subnet host_routes attribute.
+    type: json
   ExternalIpSubnet:
     default: ''
     description: IP address/subnet on the external network

ci/common/net-config-multinode.yaml

@@ -20,6 +20,14 @@ parameters:
     description: The default route of the control plane network. (The parameter
       is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
     type: string
+  ControlPlaneStaticRoutes:
+    default: []
+    description: >
+      Routes for the ctlplane network traffic.
+      JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+      Unless the default is changed, the parameter is automatically resolved
+      from the subnet host_routes attribute.
+    type: json
   ExternalIpSubnet:
     default: ''
     description: IP address/subnet on the external network

ci/common/net-config-simple-bridge.yaml

@@ -17,6 +17,14 @@ parameters:
     description: The default route of the control plane network. (The parameter
       is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
     type: string
+  ControlPlaneStaticRoutes:
+    default: []
+    description: >
+      Routes for the ctlplane network traffic.
+      JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+      Unless the default is changed, the parameter is automatically resolved
+      from the subnet host_routes attribute.
+    type: json
   ExternalIpSubnet:
     default: ''
     description: IP address/subnet on the external network

ci/environments/network/multiple-nics-ipv6/nic-configs/ceph-storage.yaml

@@ -121,6 +121,14 @@ parameters:
     description: The default route of the control plane network. (The parameter
       is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
     type: string
+  ControlPlaneStaticRoutes:
+    default: []
+    description: >
+      Routes for the ctlplane network traffic.
+      JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+      Unless the default is changed, the parameter is automatically resolved
+      from the subnet host_routes attribute.
+    type: json
   DnsServers: # Override this via parameter_defaults
     default: []
     description: >

ci/environments/network/multiple-nics-ipv6/nic-configs/cinder-storage.yaml

@@ -121,6 +121,14 @@ parameters:
     description: The default route of the control plane network. (The parameter
       is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
     type: string
+  ControlPlaneStaticRoutes:
+    default: []
+    description: >
+      Routes for the ctlplane network traffic.
+      JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+      Unless the default is changed, the parameter is automatically resolved
+      from the subnet host_routes attribute.
+    type: json
   DnsServers: # Override this via parameter_defaults
     default: []
     description: >

ci/environments/network/multiple-nics-ipv6/nic-configs/compute.yaml

@@ -121,6 +121,14 @@ parameters:
     description: The default route of the control plane network. (The parameter
       is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
     type: string
+  ControlPlaneStaticRoutes:
+    default: []
+    description: >
+      Routes for the ctlplane network traffic.
+      JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+      Unless the default is changed, the parameter is automatically resolved
+      from the subnet host_routes attribute.
+    type: json
   DnsServers: # Override this via parameter_defaults
     default: []
     description: >

ci/environments/network/multiple-nics-ipv6/nic-configs/controller.yaml

@@ -121,6 +121,14 @@ parameters:
     description: The default route of the control plane network. (The parameter
       is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
     type: string
+  ControlPlaneStaticRoutes:
+    default: []
+    description: >
+      Routes for the ctlplane network traffic.
+      JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+      Unless the default is changed, the parameter is automatically resolved
+      from the subnet host_routes attribute.
+    type: json
   DnsServers: # Override this via parameter_defaults
     default: []
     description: >

ci/environments/network/multiple-nics-ipv6/nic-configs/swift-storage.yaml

@@ -121,6 +121,14 @@ parameters:
     description: The default route of the control plane network. (The parameter
       is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
     type: string
+  ControlPlaneStaticRoutes:
+    default: []
+    description: >
+      Routes for the ctlplane network traffic.
+      JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+      Unless the default is changed, the parameter is automatically resolved
+      from the subnet host_routes attribute.
+    type: json
   DnsServers: # Override this via parameter_defaults
     default: []
     description: >

ci/environments/network/multiple-nics/nic-configs/ceph-storage.yaml

@@ -121,6 +121,14 @@ parameters:
     description: The default route of the control plane network. (The parameter
       is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
     type: string
+  ControlPlaneStaticRoutes:
+    default: []
+    description: >
+      Routes for the ctlplane network traffic.
+      JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+      Unless the default is changed, the parameter is automatically resolved
+      from the subnet host_routes attribute.
+    type: json
   DnsServers: # Override this via parameter_defaults
     default: []
     description: >

ci/environments/network/multiple-nics/nic-configs/cinder-storage.yaml

@@ -121,6 +121,14 @@ parameters:
     description: The default route of the control plane network. (The parameter
       is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
     type: string
+  ControlPlaneStaticRoutes:
+    default: []
+    description: >
+      Routes for the ctlplane network traffic.
+      JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+      Unless the default is changed, the parameter is automatically resolved
+      from the subnet host_routes attribute.
+    type: json
   DnsServers: # Override this via parameter_defaults
     default: []
     description: >

ci/environments/network/multiple-nics/nic-configs/compute.yaml

@@ -121,6 +121,14 @@ parameters:
     description: The default route of the control plane network. (The parameter
       is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
     type: string
+  ControlPlaneStaticRoutes:
+    default: []
+    description: >
+      Routes for the ctlplane network traffic.
+      JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+      Unless the default is changed, the parameter is automatically resolved
+      from the subnet host_routes attribute.
+    type: json
   DnsServers: # Override this via parameter_defaults
     default: []
     description: >

ci/environments/network/multiple-nics/nic-configs/controller.yaml

@@ -121,6 +121,14 @@ parameters:
     description: The default route of the control plane network. (The parameter
       is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
     type: string
+  ControlPlaneStaticRoutes:
+    default: []
+    description: >
+      Routes for the ctlplane network traffic.
+      JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+      Unless the default is changed, the parameter is automatically resolved
+      from the subnet host_routes attribute.
+    type: json
   DnsServers: # Override this via parameter_defaults
     default: []
     description: >

ci/environments/network/multiple-nics/nic-configs/swift-storage.yaml

@@ -121,6 +121,14 @@ parameters:
     description: The default route of the control plane network. (The parameter
       is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
     type: string
+  ControlPlaneStaticRoutes:
+    default: []
+    description: >
+      Routes for the ctlplane network traffic.
+      JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+      Unless the default is changed, the parameter is automatically resolved
+      from the subnet host_routes attribute.
+    type: json
   DnsServers: # Override this via parameter_defaults
     default: []
     description: >

ci/environments/network/public-bond/nic-configs/ceph-storage.yaml

@@ -121,6 +121,14 @@ parameters:
     description: The default route of the control plane network. (The parameter
       is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
     type: string
+  ControlPlaneStaticRoutes:
+    default: []
+    description: >
+      Routes for the ctlplane network traffic.
+      JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+      Unless the default is changed, the parameter is automatically resolved
+      from the subnet host_routes attribute.
+    type: json
   DnsServers: # Override this via parameter_defaults
     default: []
     description: >

ci/environments/network/public-bond/nic-configs/cinder-storage.yaml

@@ -121,6 +121,14 @@ parameters:
     description: The default route of the control plane network. (The parameter
       is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
     type: string
+  ControlPlaneStaticRoutes:
+    default: []
+    description: >
+      Routes for the ctlplane network traffic.
+      JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+      Unless the default is changed, the parameter is automatically resolved
+      from the subnet host_routes attribute.
+    type: json
   DnsServers: # Override this via parameter_defaults
     default: []
     description: >

ci/environments/network/public-bond/nic-configs/compute.yaml

@@ -121,6 +121,14 @@ parameters:
     description: The default route of the control plane network. (The parameter
       is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
     type: string
+  ControlPlaneStaticRoutes:
+    default: []
+    description: >
+      Routes for the ctlplane network traffic.
+      JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+      Unless the default is changed, the parameter is automatically resolved
+      from the subnet host_routes attribute.
+    type: json
   DnsServers: # Override this via parameter_defaults
     default: []
     description: >

ci/environments/network/public-bond/nic-configs/controller.yaml

@@ -121,6 +121,14 @@ parameters:
     description: The default route of the control plane network. (The parameter
       is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
     type: string
+  ControlPlaneStaticRoutes:
+    default: []
+    description: >
+      Routes for the ctlplane network traffic.
+      JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+      Unless the default is changed, the parameter is automatically resolved
+      from the subnet host_routes attribute.
+    type: json
   DnsServers: # Override this via parameter_defaults
     default: []
     description: >

ci/environments/network/public-bond/nic-configs/swift-storage.yaml

@@ -121,6 +121,14 @@ parameters:
     description: The default route of the control plane network. (The parameter
       is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
     type: string
+  ControlPlaneStaticRoutes:
+    default: []
+    description: >
+      Routes for the ctlplane network traffic.
+      JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+      Unless the default is changed, the parameter is automatically resolved
+      from the subnet host_routes attribute.
+    type: json
   DnsServers: # Override this via parameter_defaults
     default: []
     description: >

net-config-bond.j2.yaml

@@ -27,6 +27,14 @@ parameters:
     description: The default route of the control plane network. (The parameter
       is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
     type: string
+  ControlPlaneStaticRoutes:
+    default: []
+    description: >
+      Routes for the ctlplane network traffic.
+      JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+      Unless the default is changed, the parameter is automatically resolved
+      from the subnet host_routes attribute.
+    type: json
   DnsServers: # Override this via parameter_defaults
     default: []
     description: >

net-config-bridge.j2.yaml

@@ -17,6 +17,14 @@ parameters:
     description: The default route of the control plane network. (The parameter
       is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
     type: string
+  ControlPlaneStaticRoutes:
+    default: []
+    description: >
+      Routes for the ctlplane network traffic.
+      JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+      Unless the default is changed, the parameter is automatically resolved
+      from the subnet host_routes attribute.
+    type: json
   DnsServers: # Override this via parameter_defaults
     default: []
     description: >

net-config-linux-bridge.j2.yaml

@@ -25,6 +25,14 @@ parameters:
       is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
     type: string
     default: 192.168.24.1
+  ControlPlaneStaticRoutes:
+    default: []
+    description: >
+      Routes for the ctlplane network traffic.
+      JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+      Unless the default is changed, the parameter is automatically resolved
+      from the subnet host_routes attribute.
+    type: json
   ControlPlaneSubnetCidr:
     default: ''
     description: >

net-config-noop.j2.yaml

@@ -20,6 +20,14 @@ parameters:
     description: The default route of the control plane network. (The parameter
       is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
     type: string
+  ControlPlaneStaticRoutes:
+    default: []
+    description: >
+      Routes for the ctlplane network traffic.
+      JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+      Unless the default is changed, the parameter is automatically resolved
+      from the subnet host_routes attribute.
+    type: json
   DnsServers: # Override this via parameter_defaults
     default: []
     description: >

net-config-standalone.j2.yaml

@@ -34,7 +34,11 @@ parameters:
     type: string
   ControlPlaneStaticRoutes:
     default: []
-    description: A list of static routes
+    description: >
+      Routes for the ctlplane network traffic.
+      JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+      Unless the default is changed, the parameter is automatically resolved
+      from the subnet host_routes attribute.
     type: json
   DnsServers: # Override this via parameter_defaults
     default: []

net-config-static-bridge-with-external-dhcp.j2.yaml

@@ -32,6 +32,14 @@ parameters:
     description: The default route of the control plane network. (The parameter
       is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
     type: string
+  ControlPlaneStaticRoutes:
+    default: []
+    description: >
+      Routes for the ctlplane network traffic.
+      JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+      Unless the default is changed, the parameter is automatically resolved
+      from the subnet host_routes attribute.
+    type: json
   DnsServers: # Override this via parameter_defaults
     default: []
     description: >

net-config-static-bridge.j2.yaml

@@ -32,6 +32,14 @@ parameters:
     description: The default route of the control plane network. (The parameter
       is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
     type: string
+  ControlPlaneStaticRoutes:
+    default: []
+    description: >
+      Routes for the ctlplane network traffic.
+      JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+      Unless the default is changed, the parameter is automatically resolved
+      from the subnet host_routes attribute.
+    type: json
   DnsServers: # Override this via parameter_defaults
     default: []
     description: >

net-config-static.j2.yaml

@@ -31,6 +31,14 @@ parameters:
     description: The default route of the control plane network. (The parameter
       is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
     type: string
+  ControlPlaneStaticRoutes:
+    default: []
+    description: >
+      Routes for the ctlplane network traffic.
+      JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+      Unless the default is changed, the parameter is automatically resolved
+      from the subnet host_routes attribute.
+    type: json
   DnsServers: # Override this via parameter_defaults
     default: []
     description: >

net-config-undercloud.j2.yaml

@@ -34,7 +34,11 @@ parameters:
     type: string
   ControlPlaneStaticRoutes:
     default: []
-    description: A list of static routes
+    description: >
+      Routes for the ctlplane network traffic.
+      JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+      Unless the default is changed, the parameter is automatically resolved
+      from the subnet host_routes attribute.
     type: json
   DnsServers: # Override this via parameter_defaults
     default: []

network/config/bond-with-vlans/controller-no-external.j2.yaml

@@ -21,6 +21,14 @@ parameters:
     description: The default route of the control plane network. (The parameter
       is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
     type: string
+  ControlPlaneStaticRoutes:
+    default: []
+    description: >
+      Routes for the ctlplane network traffic.
+      JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+      Unless the default is changed, the parameter is automatically resolved
+      from the subnet host_routes attribute.
+    type: json
 {% for network in networks %}
   {{network.name}}IpSubnet:
     default: ''
@@ -90,12 +98,14 @@ resources:
                     - - get_param: ControlPlaneIp
                       - get_param: ControlPlaneSubnetCidr
                 routes:
-                - ip_netmask: 169.254.169.254/32
+                  list_concat_unique:
-                  next_hop:
+                    - get_param: ControlPlaneStaticRoutes
-                    get_param: EC2MetadataIp
+                    - - ip_netmask: 169.254.169.254/32
-                - default: true
+                        next_hop:
-                  next_hop:
+                          get_param: EC2MetadataIp
-                    get_param: ControlPlaneDefaultRoute
+                      - default: true  # NOTE(hjensas): This is the IPv4 default route
+                        next_hop:
+                        get_param: ControlPlaneDefaultRoute
               - type: ovs_bridge
                 name: bridge_name
                 use_dhcp: true

network/config/bond-with-vlans/controller-v6.j2.yaml

@@ -19,6 +19,14 @@ parameters:
     description: The default route of the control plane network. (The parameter
       is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
     type: string
+  ControlPlaneStaticRoutes:
+    default: []
+    description: >
+      Routes for the ctlplane network traffic.
+      JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+      Unless the default is changed, the parameter is automatically resolved
+      from the subnet host_routes attribute.
+    type: json
 {% for network in networks %}
   {{network.name}}IpSubnet:
     default: ''
@@ -88,12 +96,14 @@ resources:
                     - - get_param: ControlPlaneIp
                       - get_param: ControlPlaneSubnetCidr
                 routes:
-                - ip_netmask: 169.254.169.254/32
+                  list_concat_unique:
-                  next_hop:
+                    - get_param: ControlPlaneStaticRoutes
-                    get_param: EC2MetadataIp
+                    - - ip_netmask: 169.254.169.254/32
-                - default: true  # NOTE(hjensas): This is the IPv4 default route
+                        next_hop:
-                  next_hop:
+                          get_param: EC2MetadataIp
-                    get_param: ControlPlaneDefaultRoute
+                      - default: true  # NOTE(hjensas): This is the IPv4 default route
+                        next_hop:
+                        get_param: ControlPlaneDefaultRoute
               - type: ovs_bridge
                 name: bridge_name
                 dns_servers:

network/config/bond-with-vlans/role.role.j2.yaml

@@ -17,6 +17,14 @@ parameters:
     description: The default route of the control plane network. (The parameter
       is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
     type: string
+  ControlPlaneStaticRoutes:
+    default: []
+    description: >
+      Routes for the ctlplane network traffic.
+      JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+      Unless the default is changed, the parameter is automatically resolved
+      from the subnet host_routes attribute.
+    type: json
 {% for network in networks %}
   {{network.name}}IpSubnet:
     default: ''
@@ -93,6 +101,7 @@ resources:
                       - get_param: ControlPlaneSubnetCidr
                 routes:
                   list_concat_unique:
+                    - get_param: ControlPlaneStaticRoutes
                     - - ip_netmask: 169.254.169.254/32
                         next_hop:
                           get_param: EC2MetadataIp

network/config/multiple-nics/compute-dvr.j2.yaml

@@ -19,6 +19,14 @@ parameters:
     description: The default route of the control plane network. (The parameter
       is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
     type: string
+  ControlPlaneStaticRoutes:
+    default: []
+    description: >
+      Routes for the ctlplane network traffic.
+      JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+      Unless the default is changed, the parameter is automatically resolved
+      from the subnet host_routes attribute.
+    type: json
 {% for network in networks %}
   {{network.name}}IpSubnet:
     default: ''
@@ -84,12 +92,14 @@ resources:
                     - - get_param: ControlPlaneIp
                       - get_param: ControlPlaneSubnetCidr
                 routes:
-                - ip_netmask: 169.254.169.254/32
+                  list_concat_unique:
-                  next_hop:
+                    - get_param: ControlPlaneStaticRoutes
-                    get_param: EC2MetadataIp
+                    - - ip_netmask: 169.254.169.254/32
-                - default: true
+                        next_hop:
-                  next_hop:
+                          get_param: EC2MetadataIp
-                    get_param: ControlPlaneDefaultRoute
+                      - default: true
+                        next_hop:
+                          get_param: ControlPlaneDefaultRoute
               - type: interface
                 name: nic2
                 use_dhcp: false

network/config/multiple-nics/controller-v6.j2.yaml

@@ -18,6 +18,14 @@ parameters:
     description: The default route of the control plane network. (The parameter
       is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
     type: string
+  ControlPlaneStaticRoutes:
+    default: []
+    description: >
+      Routes for the ctlplane network traffic.
+      JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+      Unless the default is changed, the parameter is automatically resolved
+      from the subnet host_routes attribute.
+    type: json
 {% for network in networks %}
   {{network.name}}IpSubnet:
     default: ''
@@ -83,13 +91,15 @@ resources:
                     - - get_param: ControlPlaneIp
                       - get_param: ControlPlaneSubnetCidr
                 routes:
-                - ip_netmask: 169.254.169.254/32
+                  list_concat_unique:
-                  next_hop:
+                    - get_param: ControlPlaneStaticRoutes
-                    get_param: EC2MetadataIp
+                    - - ip_netmask: 169.254.169.254/32
-                # IPv4 Default Route
+                        next_hop:
-                - default: true  # NOTE(hjensas): This is the IPv4 default route
+                          get_param: EC2MetadataIp
-                  next_hop:
+                      # IPv4 Default Route
-                    get_param: ControlPlaneDefaultRoute
+                      - default: true  # NOTE(hjensas): This is the IPv4 default route
+                        next_hop:
+                          get_param: ControlPlaneDefaultRoute
               - type: interface
                 name: nic2
                 use_dhcp: false

network/config/multiple-nics/role.role.j2.yaml

@@ -17,6 +17,14 @@ parameters:
     description: The default route of the control plane network. (The parameter
       is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
     type: string
+  ControlPlaneStaticRoutes:
+    default: []
+    description: >
+      Routes for the ctlplane network traffic.
+      JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+      Unless the default is changed, the parameter is automatically resolved
+      from the subnet host_routes attribute.
+    type: json
 {% for network in networks %}
   {{network.name}}IpSubnet:
     default: ''
@@ -88,13 +96,15 @@ resources:
                     - - get_param: ControlPlaneIp
                       - get_param: ControlPlaneSubnetCidr
                 routes:
-                - ip_netmask: 169.254.169.254/32
+                  list_concat_unique:
-                  next_hop:
+                    - get_param: ControlPlaneStaticRoutes
-                    get_param: EC2MetadataIp
+                    - - ip_netmask: 169.254.169.254/32
+                        next_hop:
+                          get_param: EC2MetadataIp
 {%- if role.default_route_networks is not defined or 'ControlPlane' in role.default_route_networks %}
-                - default: true
+                      - default: true
-                  next_hop:
+                        next_hop:
-                    get_param: ControlPlaneDefaultRoute
+                          get_param: ControlPlaneDefaultRoute
 {%- endif %}
 {%- set nics_used = [1] %}
 {%- for network in networks if network.enabled|default(true) and network.name not in role.networks_skip_config|default([]) %}

network/config/single-nic-linux-bridge-vlans/controller-v6.j2.yaml

@@ -18,6 +18,14 @@ parameters:
     description: The default route of the control plane network. (The parameter
       is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
     type: string
+  ControlPlaneStaticRoutes:
+    default: []
+    description: >
+      Routes for the ctlplane network traffic.
+      JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+      Unless the default is changed, the parameter is automatically resolved
+      from the subnet host_routes attribute.
+    type: json
 {% for network in networks %}
   {{network.name}}IpSubnet:
     default: ''
@@ -83,12 +91,14 @@ resources:
                     - - get_param: ControlPlaneIp
                       - get_param: ControlPlaneSubnetCidr
                 routes:
-                - ip_netmask: 169.254.169.254/32
+                  list_concat_unique:
-                  next_hop:
+                    - get_param: ControlPlaneStaticRoutes
-                    get_param: EC2MetadataIp
+                    - - ip_netmask: 169.254.169.254/32
-                - default: true  # NOTE(hjensas): This is the IPv4 default route
+                        next_hop:
-                  next_hop:
+                          get_param: EC2MetadataIp
-                    get_param: ControlPlaneDefaultRoute
+                      - default: true  # NOTE(hjensas): This is the IPv4 default route
+                        next_hop:
+                          get_param: ControlPlaneDefaultRoute
                 members:
                 - type: interface
                   name: interface_name

network/config/single-nic-linux-bridge-vlans/role.role.j2.yaml

@@ -17,6 +17,14 @@ parameters:
     description: The default route of the control plane network. (The parameter
       is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
     type: string
+  ControlPlaneStaticRoutes:
+    default: []
+    description: >
+      Routes for the ctlplane network traffic.
+      JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+      Unless the default is changed, the parameter is automatically resolved
+      from the subnet host_routes attribute.
+    type: json
 {% for network in networks %}
   {{network.name}}IpSubnet:
     default: ''
@@ -86,13 +94,15 @@ resources:
                     - - get_param: ControlPlaneIp
                       - get_param: ControlPlaneSubnetCidr
                 routes:
-                - ip_netmask: 169.254.169.254/32
+                  list_concat_unique:
-                  next_hop:
+                    - get_param: ControlPlaneStaticRoutes
-                    get_param: EC2MetadataIp
+                    - - ip_netmask: 169.254.169.254/32
+                        next_hop:
+                          get_param: EC2MetadataIp
 {%- if role.default_route_networks is not defined or 'ControlPlane' in role.default_route_networks %}
-                - default: true
+                      - default: true
-                  next_hop:
+                        next_hop:
-                    get_param: ControlPlaneDefaultRoute
+                          get_param: ControlPlaneDefaultRoute
 {%- endif %}
                 members:
                 - type: interface

network/config/single-nic-vlans/controller-no-external.j2.yaml

@@ -21,6 +21,14 @@ parameters:
     description: The default route of the control plane network. (The parameter
       is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
     type: string
+  ControlPlaneStaticRoutes:
+    default: []
+    description: >
+      Routes for the ctlplane network traffic.
+      JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+      Unless the default is changed, the parameter is automatically resolved
+      from the subnet host_routes attribute.
+    type: json
 {% for network in networks %}
   {{network.name}}IpSubnet:
     default: ''
@@ -86,12 +94,14 @@ resources:
                     - - get_param: ControlPlaneIp
                       - get_param: ControlPlaneSubnetCidr
                 routes:
-                - ip_netmask: 169.254.169.254/32
+                  list_concat_unique:
-                  next_hop:
+                    - get_param: ControlPlaneStaticRoutes
-                    get_param: EC2MetadataIp
+                    - - ip_netmask: 169.254.169.254/32
-                - default: true
+                        next_hop:
-                  next_hop:
+                          get_param: EC2MetadataIp
-                    get_param: ControlPlaneDefaultRoute
+                      - default: true
+                        next_hop:
+                          get_param: ControlPlaneDefaultRoute
                 members:
                 - type: interface
                   name: nic1

network/config/single-nic-vlans/controller-v6.j2.yaml

@@ -18,6 +18,14 @@ parameters:
     description: The default route of the control plane network. (The parameter
       is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
     type: string
+  ControlPlaneStaticRoutes:
+    default: []
+    description: >
+      Routes for the ctlplane network traffic.
+      JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+      Unless the default is changed, the parameter is automatically resolved
+      from the subnet host_routes attribute.
+    type: json
 {% for network in networks %}
   {{network.name}}IpSubnet:
     default: ''
@@ -83,12 +91,14 @@ resources:
                     - - get_param: ControlPlaneIp
                       - get_param: ControlPlaneSubnetCidr
                 routes:
-                - ip_netmask: 169.254.169.254/32
+                  list_concat_unique:
-                  next_hop:
+                    - get_param: ControlPlaneStaticRoutes
-                    get_param: EC2MetadataIp
+                    - - ip_netmask: 169.254.169.254/32
-                - default: true  # NOTE(hjensas): This is the IPv4 default route
+                        next_hop:
-                  next_hop:
+                          get_param: EC2MetadataIp
-                    get_param: ControlPlaneDefaultRoute
+                      - default: true  # NOTE(hjensas): This is the IPv4 default route
+                        next_hop:
+                          get_param: ControlPlaneDefaultRoute
                 members:
                 - type: interface
                   name: nic1

network/config/single-nic-vlans/role.role.j2.yaml

@@ -17,6 +17,14 @@ parameters:
     description: The default route of the control plane network. (The parameter
       is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
     type: string
+  ControlPlaneStaticRoutes:
+    default: []
+    description: >
+      Routes for the ctlplane network traffic.
+      JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+      Unless the default is changed, the parameter is automatically resolved
+      from the subnet host_routes attribute.
+    type: json
 {% for network in networks %}
   {{network.name}}IpSubnet:
     default: ''
@@ -86,13 +94,15 @@ resources:
                     - - get_param: ControlPlaneIp
                       - get_param: ControlPlaneSubnetCidr
                 routes:
-                - ip_netmask: 169.254.169.254/32
+                  list_concat_unique:
-                  next_hop:
+                    - get_param: ControlPlaneStaticRoutes
-                    get_param: EC2MetadataIp
+                    - - ip_netmask: 169.254.169.254/32
+                        next_hop:
+                          get_param: EC2MetadataIp
 {%- if role.default_route_networks is not defined or 'ControlPlane' in role.default_route_networks %}
-                - default: true
+                      - default: true
-                  next_hop:
+                        next_hop:
-                    get_param: ControlPlaneDefaultRoute
+                          get_param: ControlPlaneDefaultRoute
 {%- endif %}
                 members:
                 - type: interface

puppet/role.role.j2.yaml

@@ -249,6 +249,14 @@ parameters:
     description: The default route of the control plane network. (The parameter
       is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
     type: string
+  ControlPlaneStaticRoutes:
+    default: []
+    description: >
+      Routes for the ctlplane network traffic.
+      JSON route e.g. [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]
+      Unless the default is changed, the parameter is automatically resolved
+      from the subnet host_routes attribute.
+    type: json
   EC2MetadataIp:
     default: ''
     description: The IP address of the EC2 metadata server. (The parameter
@@ -353,6 +361,9 @@ conditions:
   ctlplane_default_route_set:
     not:
       equals: [{get_param: ControlPlaneDefaultRoute}, '']
+  ctlplane_static_routes_set:
+    not:
+        equals: [{get_param: ControlPlaneStaticRoutes}, []]
   ec2metadaip_set:
     not:
       equals: [{get_param: EC2MetadataIp}, '']
@@ -504,6 +515,11 @@ resources:
           - ctlplane_default_route_set
           - {get_param: ControlPlaneDefaultRoute}
           - {get_attr: [{{server_resource_name}}, addresses, ctlplane, 0, subnets, 0, gateway_ip]}
+      ControlPlaneStaticRoutes:
+        if:
+          - ctlplane_static_routes_set
+          - {get_param: ControlPlaneStaticRoutes}
+          - {get_attr: [{{server_resource_name}}, addresses, ctlplane, 0, subnets, 0, host_routes]}
       EC2MetadataIp:
         if:
           - ec2metadaip_set