Add per-network routes to NIC templates

This change adds a new {{network.name}}InterfaceRoutes
parameter to network config templates. It takes a list
of routes i.e:
  [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]

Co-Authored-By: Harald Jensås <hjensas@redhat.com>
Partial: blueprint tripleo-routed-networks-templates
Depends-On: Ifc5aad7a154c33488a7613c8ee038c92ee6cb1a7
Change-Id: I90aea46d3addab9792c7c9d4feff5c5f61520b9b

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

@@ -9,34 +9,6 @@ parameters:
     default: ''
     description: IP address/subnet on the ctlplane network
     type: string
-  ExternalIpSubnet:
-    default: ''
-    description: IP address/subnet on the external network
-    type: string
-  InternalApiIpSubnet:
-    default: ''
-    description: IP address/subnet on the internal_api network
-    type: string
-  StorageIpSubnet:
-    default: ''
-    description: IP address/subnet on the storage network
-    type: string
-  StorageMgmtIpSubnet:
-    default: ''
-    description: IP address/subnet on the storage_mgmt network
-    type: string
-  StorageNFSIpSubnet:
-    default: ''
-    description: IP address/subnet on the storage_nfs network
-    type: string
-  TenantIpSubnet:
-    default: ''
-    description: IP address/subnet on the tenant network
-    type: string
-  ManagementIpSubnet:
-    default: ''
-    description: IP address/subnet on the management network
-    type: string
   ControlPlaneSubnetCidr:
     default: ''
     description: >
@@ -48,6 +20,90 @@ 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
+  ExternalIpSubnet:
+    default: ''
+    description: IP address/subnet on the external network
+    type: string
+  ExternalInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the external 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
+  InternalApiIpSubnet:
+    default: ''
+    description: IP address/subnet on the internal_api network
+    type: string
+  InternalApiInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the internal_api 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
+  StorageIpSubnet:
+    default: ''
+    description: IP address/subnet on the storage network
+    type: string
+  StorageInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the storage 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
+  StorageMgmtIpSubnet:
+    default: ''
+    description: IP address/subnet on the storage_mgmt network
+    type: string
+  StorageMgmtInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the storage_mgmt 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
+  StorageNFSIpSubnet:
+    default: ''
+    description: IP address/subnet on the storage_nfs network
+    type: string
+  StorageNFSRoutes:
+    default: []
+    description: >
+      Routes for the storage_nfs 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
+  TenantIpSubnet:
+    default: ''
+    description: IP address/subnet on the tenant network
+    type: string
+  TenantInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the tenant 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
+  ManagementIpSubnet:
+    default: ''
+    description: IP address/subnet on the management network
+    type: string
+  ManagementInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the management 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
   OvSBridgeMtu:
     default: 1300
     description: The mtu of the OvS bridge

ci/common/net-config-multinode.yaml

@@ -9,34 +9,6 @@ parameters:
     default: ''
     description: IP address/subnet on the ctlplane network
     type: string
-  ExternalIpSubnet:
-    default: ''
-    description: IP address/subnet on the external network
-    type: string
-  InternalApiIpSubnet:
-    default: ''
-    description: IP address/subnet on the internal_api network
-    type: string
-  StorageIpSubnet:
-    default: ''
-    description: IP address/subnet on the storage network
-    type: string
-  StorageMgmtIpSubnet:
-    default: ''
-    description: IP address/subnet on the storage_mgmt network
-    type: string
-  StorageNFSIpSubnet:
-    default: ''
-    description: IP address/subnet on the storage_nfs network
-    type: string
-  TenantIpSubnet:
-    default: ''
-    description: IP address/subnet on the tenant network
-    type: string
-  ManagementIpSubnet:
-    default: ''
-    description: IP address/subnet on the management network
-    type: string
   ControlPlaneSubnetCidr:
     default: ''
     description: >
@@ -48,6 +20,82 @@ 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
+  ExternalIpSubnet:
+    default: ''
+    description: IP address/subnet on the external network
+    type: string
+  ExternalInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the external 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
+  InternalApiIpSubnet:
+    default: ''
+    description: IP address/subnet on the internal_api network
+    type: string
+  InternalApiInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the internal_api 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
+  StorageIpSubnet:
+    default: ''
+    description: IP address/subnet on the storage network
+    type: string
+  StorageInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the storage 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
+  StorageMgmtIpSubnet:
+    default: ''
+    description: IP address/subnet on the storage_mgmt network
+    type: string
+  StorageMgmtInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the storage_mgmt 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
+  StorageNFSIpSubnet:
+    default: ''
+    description: IP address/subnet on the storage_nfs network
+    type: string
+  TenantIpSubnet:
+    default: ''
+    description: IP address/subnet on the tenant network
+    type: string
+  TenantInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the tenant 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
+  ManagementIpSubnet:
+    default: ''
+    description: IP address/subnet on the management network
+    type: string
+  ManagementInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the management 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/common/net-config-simple-bridge.yaml

@@ -21,26 +21,78 @@ parameters:
     default: ''
     description: IP address/subnet on the external network
     type: string
+  ExternalInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the external 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
   InternalApiIpSubnet:
     default: ''
     description: IP address/subnet on the internal_api network
     type: string
+  InternalApiInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the internal_api 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
   StorageIpSubnet:
     default: ''
     description: IP address/subnet on the storage network
     type: string
+  StorageInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the storage 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
   StorageMgmtIpSubnet:
     default: ''
     description: IP address/subnet on the storage_mgmt network
     type: string
+  StorageMgmtInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the storage_mgmt 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
+  StorageNFSIpSubnet:
+    default: ''
+    description: IP address/subnet on the storage_nfs network
+    type: string
   TenantIpSubnet:
     default: ''
     description: IP address/subnet on the tenant network
     type: string
+  TenantInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the tenant 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
   ManagementIpSubnet:
     default: ''
     description: IP address/subnet on the management network
     type: string
+  ManagementInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the management 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/ceph-storage.yaml

@@ -9,26 +9,74 @@ parameters:
     default: ''
     description: IP address/subnet on the external network
     type: string
+  ExternalInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the external 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
   InternalApiIpSubnet:
     default: ''
     description: IP address/subnet on the internal_api network
     type: string
+  InternalApiInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the internal_api 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
   StorageIpSubnet:
     default: ''
     description: IP address/subnet on the storage network
     type: string
+  StorageInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the storage 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
   StorageMgmtIpSubnet:
     default: ''
     description: IP address/subnet on the storage_mgmt network
     type: string
+  StorageMgmtInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the storage_mgmt 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
   TenantIpSubnet:
     default: ''
     description: IP address/subnet on the tenant network
     type: string
+  TenantInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the tenant 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
   ManagementIpSubnet: # Only populated when including environments/network-management.yaml
     default: ''
     description: IP address/subnet on the management network
     type: string
+  ManagementInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the management 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
   BondInterfaceOvsOptions:
     default: 'bond_mode=active-backup'
     description: The ovs_options string for the bond interface. Set things like

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

@@ -9,26 +9,74 @@ parameters:
     default: ''
     description: IP address/subnet on the external network
     type: string
+  ExternalInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the external 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
   InternalApiIpSubnet:
     default: ''
     description: IP address/subnet on the internal_api network
     type: string
+  InternalApiInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the internal_api 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
   StorageIpSubnet:
     default: ''
     description: IP address/subnet on the storage network
     type: string
+  StorageInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the storage 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
   StorageMgmtIpSubnet:
     default: ''
     description: IP address/subnet on the storage_mgmt network
     type: string
+  StorageMgmtInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the storage_mgmt 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
   TenantIpSubnet:
     default: ''
     description: IP address/subnet on the tenant network
     type: string
+  TenantInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the tenant 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
   ManagementIpSubnet: # Only populated when including environments/network-management.yaml
     default: ''
     description: IP address/subnet on the management network
     type: string
+  ManagementInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the management 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
   BondInterfaceOvsOptions:
     default: 'bond_mode=active-backup'
     description: The ovs_options string for the bond interface. Set things like

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

@@ -9,26 +9,74 @@ parameters:
     default: ''
     description: IP address/subnet on the external network
     type: string
+  ExternalInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the external 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
   InternalApiIpSubnet:
     default: ''
     description: IP address/subnet on the internal_api network
     type: string
+  InternalApiInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the internal_api 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
   StorageIpSubnet:
     default: ''
     description: IP address/subnet on the storage network
     type: string
+  StorageInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the storage 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
   StorageMgmtIpSubnet:
     default: ''
     description: IP address/subnet on the storage_mgmt network
     type: string
+  StorageMgmtInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the storage_mgmt 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
   TenantIpSubnet:
     default: ''
     description: IP address/subnet on the tenant network
     type: string
+  TenantInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the tenant 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
   ManagementIpSubnet: # Only populated when including environments/network-management.yaml
     default: ''
     description: IP address/subnet on the management network
     type: string
+  ManagementInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the management 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
   BondInterfaceOvsOptions:
     default: 'bond_mode=active-backup'
     description: The ovs_options string for the bond interface. Set things like

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

@@ -9,26 +9,74 @@ parameters:
     default: ''
     description: IP address/subnet on the external network
     type: string
+  ExternalInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the external 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
   InternalApiIpSubnet:
     default: ''
     description: IP address/subnet on the internal_api network
     type: string
+  InternalApiInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the internal_api 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
   StorageIpSubnet:
     default: ''
     description: IP address/subnet on the storage network
     type: string
+  StorageInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the storage 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
   StorageMgmtIpSubnet:
     default: ''
     description: IP address/subnet on the storage_mgmt network
     type: string
+  StorageMgmtInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the storage_mgmt 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
   TenantIpSubnet:
     default: ''
     description: IP address/subnet on the tenant network
     type: string
+  TenantInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the tenant 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
   ManagementIpSubnet: # Only populated when including environments/network-management.yaml
     default: ''
     description: IP address/subnet on the management network
     type: string
+  ManagementInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the management 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
   BondInterfaceOvsOptions:
     default: 'bond_mode=active-backup'
     description: The ovs_options string for the bond interface. Set things like

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

@@ -9,26 +9,74 @@ parameters:
     default: ''
     description: IP address/subnet on the external network
     type: string
+  ExternalInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the external 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
   InternalApiIpSubnet:
     default: ''
     description: IP address/subnet on the internal_api network
     type: string
+  InternalApiInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the internal_api 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
   StorageIpSubnet:
     default: ''
     description: IP address/subnet on the storage network
     type: string
+  StorageInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the storage 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
   StorageMgmtIpSubnet:
     default: ''
     description: IP address/subnet on the storage_mgmt network
     type: string
+  StorageMgmtInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the storage_mgmt 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
   TenantIpSubnet:
     default: ''
     description: IP address/subnet on the tenant network
     type: string
+  TenantInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the tenant 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
   ManagementIpSubnet: # Only populated when including environments/network-management.yaml
     default: ''
     description: IP address/subnet on the management network
     type: string
+  ManagementInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the management 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
   BondInterfaceOvsOptions:
     default: 'bond_mode=active-backup'
     description: The ovs_options string for the bond interface. Set things like

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

@@ -9,26 +9,74 @@ parameters:
     default: ''
     description: IP address/subnet on the external network
     type: string
+  ExternalInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the external 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
   InternalApiIpSubnet:
     default: ''
     description: IP address/subnet on the internal_api network
     type: string
+  InternalApiInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the internal_api 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
   StorageIpSubnet:
     default: ''
     description: IP address/subnet on the storage network
     type: string
+  StorageInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the storage 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
   StorageMgmtIpSubnet:
     default: ''
     description: IP address/subnet on the storage_mgmt network
     type: string
+  StorageMgmtInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the storage_mgmt 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
   TenantIpSubnet:
     default: ''
     description: IP address/subnet on the tenant network
     type: string
+  TenantInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the tenant 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
   ManagementIpSubnet: # Only populated when including environments/network-management.yaml
     default: ''
     description: IP address/subnet on the management network
     type: string
+  ManagementInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the management 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
   BondInterfaceOvsOptions:
     default: 'bond_mode=active-backup'
     description: The ovs_options string for the bond interface. Set things like

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

@@ -9,26 +9,74 @@ parameters:
     default: ''
     description: IP address/subnet on the external network
     type: string
+  ExternalInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the external 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
   InternalApiIpSubnet:
     default: ''
     description: IP address/subnet on the internal_api network
     type: string
+  InternalApiInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the internal_api 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
   StorageIpSubnet:
     default: ''
     description: IP address/subnet on the storage network
     type: string
+  StorageInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the storage 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
   StorageMgmtIpSubnet:
     default: ''
     description: IP address/subnet on the storage_mgmt network
     type: string
+  StorageMgmtInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the storage_mgmt 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
   TenantIpSubnet:
     default: ''
     description: IP address/subnet on the tenant network
     type: string
+  TenantInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the tenant 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
   ManagementIpSubnet: # Only populated when including environments/network-management.yaml
     default: ''
     description: IP address/subnet on the management network
     type: string
+  ManagementInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the management 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
   BondInterfaceOvsOptions:
     default: 'bond_mode=active-backup'
     description: The ovs_options string for the bond interface. Set things like

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

@@ -9,26 +9,74 @@ parameters:
     default: ''
     description: IP address/subnet on the external network
     type: string
+  ExternalInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the external 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
   InternalApiIpSubnet:
     default: ''
     description: IP address/subnet on the internal_api network
     type: string
+  InternalApiInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the internal_api 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
   StorageIpSubnet:
     default: ''
     description: IP address/subnet on the storage network
     type: string
+  StorageInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the storage 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
   StorageMgmtIpSubnet:
     default: ''
     description: IP address/subnet on the storage_mgmt network
     type: string
+  StorageMgmtInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the storage_mgmt 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
   TenantIpSubnet:
     default: ''
     description: IP address/subnet on the tenant network
     type: string
+  TenantInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the tenant 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
   ManagementIpSubnet: # Only populated when including environments/network-management.yaml
     default: ''
     description: IP address/subnet on the management network
     type: string
+  ManagementInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the management 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
   BondInterfaceOvsOptions:
     default: 'bond_mode=active-backup'
     description: The ovs_options string for the bond interface. Set things like

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

@@ -9,26 +9,74 @@ parameters:
     default: ''
     description: IP address/subnet on the external network
     type: string
+  ExternalInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the external 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
   InternalApiIpSubnet:
     default: ''
     description: IP address/subnet on the internal_api network
     type: string
+  InternalApiInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the internal_api 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
   StorageIpSubnet:
     default: ''
     description: IP address/subnet on the storage network
     type: string
+  StorageInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the storage 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
   StorageMgmtIpSubnet:
     default: ''
     description: IP address/subnet on the storage_mgmt network
     type: string
+  StorageMgmtInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the storage_mgmt 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
   TenantIpSubnet:
     default: ''
     description: IP address/subnet on the tenant network
     type: string
+  TenantInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the tenant 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
   ManagementIpSubnet: # Only populated when including environments/network-management.yaml
     default: ''
     description: IP address/subnet on the management network
     type: string
+  ManagementInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the management 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
   BondInterfaceOvsOptions:
     default: 'bond_mode=active-backup'
     description: The ovs_options string for the bond interface. Set things like

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

@@ -9,26 +9,74 @@ parameters:
     default: ''
     description: IP address/subnet on the external network
     type: string
+  ExternalInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the external 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
   InternalApiIpSubnet:
     default: ''
     description: IP address/subnet on the internal_api network
     type: string
+  InternalApiInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the internal_api 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
   StorageIpSubnet:
     default: ''
     description: IP address/subnet on the storage network
     type: string
+  StorageInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the storage 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
   StorageMgmtIpSubnet:
     default: ''
     description: IP address/subnet on the storage_mgmt network
     type: string
+  StorageMgmtInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the storage_mgmt 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
   TenantIpSubnet:
     default: ''
     description: IP address/subnet on the tenant network
     type: string
+  TenantInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the tenant 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
   ManagementIpSubnet: # Only populated when including environments/network-management.yaml
     default: ''
     description: IP address/subnet on the management network
     type: string
+  ManagementInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the management 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
   BondInterfaceOvsOptions:
     default: 'bond_mode=active-backup'
     description: The ovs_options string for the bond interface. Set things like

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

@@ -9,26 +9,74 @@ parameters:
     default: ''
     description: IP address/subnet on the external network
     type: string
+  ExternalInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the external 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
   InternalApiIpSubnet:
     default: ''
     description: IP address/subnet on the internal_api network
     type: string
+  InternalApiInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the internal_api 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
   StorageIpSubnet:
     default: ''
     description: IP address/subnet on the storage network
     type: string
+  StorageInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the storage 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
   StorageMgmtIpSubnet:
     default: ''
     description: IP address/subnet on the storage_mgmt network
     type: string
+  StorageMgmtInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the storage_mgmt 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
   TenantIpSubnet:
     default: ''
     description: IP address/subnet on the tenant network
     type: string
+  TenantInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the tenant 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
   ManagementIpSubnet: # Only populated when including environments/network-management.yaml
     default: ''
     description: IP address/subnet on the management network
     type: string
+  ManagementInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the management 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
   BondInterfaceOvsOptions:
     default: 'bond_mode=active-backup'
     description: The ovs_options string for the bond interface. Set things like

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

@@ -9,26 +9,74 @@ parameters:
     default: ''
     description: IP address/subnet on the external network
     type: string
+  ExternalInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the external 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
   InternalApiIpSubnet:
     default: ''
     description: IP address/subnet on the internal_api network
     type: string
+  InternalApiInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the internal_api 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
   StorageIpSubnet:
     default: ''
     description: IP address/subnet on the storage network
     type: string
+  StorageInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the storage 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
   StorageMgmtIpSubnet:
     default: ''
     description: IP address/subnet on the storage_mgmt network
     type: string
+  StorageMgmtInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the storage_mgmt 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
   TenantIpSubnet:
     default: ''
     description: IP address/subnet on the tenant network
     type: string
+  TenantInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the tenant 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
   ManagementIpSubnet: # Only populated when including environments/network-management.yaml
     default: ''
     description: IP address/subnet on the management network
     type: string
+  ManagementInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the management 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
   BondInterfaceOvsOptions:
     default: 'bond_mode=active-backup'
     description: The ovs_options string for the bond interface. Set things like

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

@@ -9,26 +9,74 @@ parameters:
     default: ''
     description: IP address/subnet on the external network
     type: string
+  ExternalInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the external 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
   InternalApiIpSubnet:
     default: ''
     description: IP address/subnet on the internal_api network
     type: string
+  InternalApiInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the internal_api 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
   StorageIpSubnet:
     default: ''
     description: IP address/subnet on the storage network
     type: string
+  StorageInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the storage 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
   StorageMgmtIpSubnet:
     default: ''
     description: IP address/subnet on the storage_mgmt network
     type: string
+  StorageMgmtInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the storage_mgmt 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
   TenantIpSubnet:
     default: ''
     description: IP address/subnet on the tenant network
     type: string
+  TenantInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the tenant 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
   ManagementIpSubnet: # Only populated when including environments/network-management.yaml
     default: ''
     description: IP address/subnet on the management network
     type: string
+  ManagementInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the management 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
   BondInterfaceOvsOptions:
     default: 'bond_mode=active-backup'
     description: The ovs_options string for the bond interface. Set things like

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

@@ -9,26 +9,74 @@ parameters:
     default: ''
     description: IP address/subnet on the external network
     type: string
+  ExternalInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the external 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
   InternalApiIpSubnet:
     default: ''
     description: IP address/subnet on the internal_api network
     type: string
+  InternalApiInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the internal_api 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
   StorageIpSubnet:
     default: ''
     description: IP address/subnet on the storage network
     type: string
+  StorageInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the storage 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
   StorageMgmtIpSubnet:
     default: ''
     description: IP address/subnet on the storage_mgmt network
     type: string
+  StorageMgmtInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the storage_mgmt 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
   TenantIpSubnet:
     default: ''
     description: IP address/subnet on the tenant network
     type: string
+  TenantInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the tenant 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
   ManagementIpSubnet: # Only populated when including environments/network-management.yaml
     default: ''
     description: IP address/subnet on the management network
     type: string
+  ManagementInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the management 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
   BondInterfaceOvsOptions:
     default: 'bond_mode=active-backup'
     description: The ovs_options string for the bond interface. Set things like

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

@@ -9,26 +9,74 @@ parameters:
     default: ''
     description: IP address/subnet on the external network
     type: string
+  ExternalInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the external 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
   InternalApiIpSubnet:
     default: ''
     description: IP address/subnet on the internal_api network
     type: string
+  InternalApiInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the internal_api 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
   StorageIpSubnet:
     default: ''
     description: IP address/subnet on the storage network
     type: string
+  StorageInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the storage 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
   StorageMgmtIpSubnet:
     default: ''
     description: IP address/subnet on the storage_mgmt network
     type: string
+  StorageMgmtInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the storage_mgmt 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
   TenantIpSubnet:
     default: ''
     description: IP address/subnet on the tenant network
     type: string
+  TenantInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the tenant 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
   ManagementIpSubnet: # Only populated when including environments/network-management.yaml
     default: ''
     description: IP address/subnet on the management network
     type: string
+  ManagementInterfaceRoutes:
+    default: []
+    description: >
+      Routes for the management 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
   BondInterfaceOvsOptions:
     default: 'bond_mode=active-backup'
     description: The ovs_options string for the bond interface. Set things like

net-config-bridge.j2.yaml

@@ -34,6 +34,14 @@ parameters:
     default: ''
     description: IP address/subnet on the {{network.name_lower}} network
     type: string
+  {{network.name}}InterfaceRoutes:
+    default: []
+    description: >
+      Routes for the {{network.name_lower}} 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
   {%- endfor %}
 resources:
   OsNetConfigImpl:

net-config-linux-bridge.j2.yaml

@@ -11,6 +11,14 @@ parameters:
     default: ''
     description: IP address/subnet on the {{network.name_lower}} network
     type: string
+  {{network.name}}InterfaceRoutes:
+    default: []
+    description: >
+      Routes for the {{network.name_lower}} 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
   {%- endfor %}
   ControlPlaneDefaultRoute:
     description: The default route of the control plane network. (The parameter

net-config-noop.j2.yaml

@@ -37,6 +37,14 @@ parameters:
     default: ''
     description: IP address/subnet on the {{network.name_lower}} network
     type: string
+  {{network.name}}InterfaceRoutes:
+    default: []
+    description: >
+      Routes for the {{network.name_lower}} 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
   {%- endfor %}
 
 resources:

net-config-standalone.j2.yaml

@@ -12,6 +12,14 @@ parameters:
     default: ''
     description: IP address/subnet on the {{network.name_lower}} network
     type: string
+  {{network.name}}InterfaceRoutes:
+    default: []
+    description: >
+      Routes for the {{network.name_lower}} 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
   {%- endfor %}
   ControlPlaneSubnetCidr:
     default: ''

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

@@ -12,6 +12,14 @@ parameters:
     default: ''
     description: IP address/subnet on the {{network.name_lower}} network
     type: string
+  {{network.name}}InterfaceRoutes:
+    default: []
+    description: >
+      Routes for the {{network.name_lower}} 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
   {%- endfor %}
   ControlPlaneSubnetCidr:
     default: ''

net-config-static-bridge.j2.yaml

@@ -12,6 +12,14 @@ parameters:
     default: ''
     description: IP address/subnet on the {{network.name_lower}} network
     type: string
+  {{network.name}}InterfaceRoutes:
+    default: []
+    description: >
+      Routes for the {{network.name_lower}} 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
   {%- endfor %}
   ControlPlaneSubnetCidr:
     default: ''

net-config-static.j2.yaml

@@ -11,6 +11,14 @@ parameters:
     default: ''
     description: IP address/subnet on the {{network.name_lower}} network
     type: string
+  {{network.name}}InterfaceRoutes:
+    default: []
+    description: >
+      Routes for the {{network.name_lower}} 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
   {%- endfor %}
   ControlPlaneSubnetCidr:
     default: ''

net-config-undercloud.j2.yaml

@@ -12,6 +12,14 @@ parameters:
     default: ''
     description: IP address/subnet on the {{network.name_lower}} network
     type: string
+  {{network.name}}InterfaceRoutes:
+    default: []
+    description: >
+      Routes for the {{network.name_lower}} 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
   {%- endfor %}
   ControlPlaneSubnetCidr:
     default: ''

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

@@ -41,7 +41,15 @@ parameters:
     description: default route for the {{network.name_lower}} network
     type: string
 {%- endif %}
-{% endfor %}
+  {{network.name}}InterfaceRoutes:
+    default: []
+    description: >
+      Routes for the {{network.name_lower}} 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
+{%- endfor %}
   DnsServers: # Override this via parameter_defaults
     default: []
     description: >
@@ -108,38 +116,47 @@ resources:
                   addresses:
                   - ip_netmask:
                       get_param: InternalApiIpSubnet
+                  routes:
+                    get_param: InternalApiInterfaceRoutes
                 - type: vlan
                   vlan_id:
                     get_param: StorageNetworkVlanID
                   addresses:
                   - ip_netmask:
                       get_param: StorageIpSubnet
+                  routes:
+                    get_param: StorageInterfaceRoutes
                 - type: vlan
                   vlan_id:
                     get_param: StorageMgmtNetworkVlanID
                   addresses:
                   - ip_netmask:
                       get_param: StorageMgmtIpSubnet
+                  routes:
+                    get_param: StorageMgmtInterfaceRoutes
                 - type: vlan
                   vlan_id:
                     get_param: TenantNetworkVlanID
                   addresses:
                   - ip_netmask:
                       get_param: TenantIpSubnet
+                  routes:
+                    get_param: TenantInterfaceRoutes
                 # Uncomment when including environments/network-management.yaml
                 # If setting default route on the Management interface, comment
                 # out the default route on the Control Plane.
-                #-
+                #- type: vlan
-                #  type: vlan
+                #  vlan_id:
-                #  device: bond1
+                #    get_param: ManagementNetworkVlanID
-                #  vlan_id: {get_param: ManagementNetworkVlanID}
                 #  addresses:
-                #    -
+                #    - ip_netmask:
-                #      ip_netmask: {get_param: ManagementIpSubnet}
+                #        get_param: ManagementIpSubnet
                 #  routes:
-                #    -
+                #    list_concat_unique:
-                #      default: true
+                #      - get_param: ManagementInterfaceRoutes
-                #      next_hop: {get_param: ManagementInterfaceDefaultRoute}
+                #      - - default: true
+                #          next_hop:
+                #            get_param: ManagementInterfaceDefaultRoute
 outputs:
   OS::stack_id:
     description: The OsNetConfigImpl resource.

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

@@ -39,7 +39,15 @@ parameters:
     description: default route for the {{network.name_lower}} network
     type: string
 {%- endif %}
-{% endfor %}
+  {{network.name}}InterfaceRoutes:
+    default: []
+    description: >
+      Routes for the {{network.name_lower}} 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
+{%- endfor %}
   DnsServers: # Override this via parameter_defaults
     default: []
     description: >
@@ -83,7 +91,7 @@ resources:
                 - ip_netmask: 169.254.169.254/32
                   next_hop:
                     get_param: EC2MetadataIp
-                - default: true
+                - default: true  # NOTE(hjensas): This is the IPv4 default route
                   next_hop:
                     get_param: ControlPlaneDefaultRoute
               - type: ovs_bridge
@@ -108,7 +116,9 @@ resources:
                   - ip_netmask:
                       get_param: ExternalIpSubnet
                   routes:
-                  - default: true
+                    list_concat_unique:
+                      - get_param: ExternalInterfaceRoutes
+                      - - default: true # NOTE(hjensas): This is the IPv6 default route
                           next_hop:
                             get_param: ExternalInterfaceDefaultRoute
                 - type: vlan
@@ -117,38 +127,48 @@ resources:
                   addresses:
                   - ip_netmask:
                       get_param: InternalApiIpSubnet
+                  routes:
+                    get_param: InternalApiInterfaceRoutes
                 - type: vlan
                   vlan_id:
                     get_param: StorageNetworkVlanID
                   addresses:
                   - ip_netmask:
                       get_param: StorageIpSubnet
+                  routes:
+                    get_param: StorageInterfaceRoutes
                 - type: vlan
                   vlan_id:
                     get_param: StorageMgmtNetworkVlanID
                   addresses:
                   - ip_netmask:
                       get_param: StorageMgmtIpSubnet
+                  routes:
+                    get_param: StorageMgmtInterfaceRoutes
                 - type: vlan
                   vlan_id:
                     get_param: TenantNetworkVlanID
                   addresses:
                   - ip_netmask:
                       get_param: TenantIpSubnet
+                  routes:
+                    get_param: TenantInterfaceRoutes
                 # 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.
-                #-
+                #- type: vlan
-                #  type: vlan
+                #  vlan_id:
-                #  vlan_id: {get_param: ManagementNetworkVlanID}
+                #    get_param: ManagementNetworkVlanID
                 #  addresses:
-                #    -
+                #  - ip_netmask:
-                #      ip_netmask: {get_param: ManagementIpSubnet}
+                #      get_param: ManagementIpSubnet
                 #  routes:
-                #    -
+                #    list_concat_unique:
-                #      default: true
+                #      - get_param: TenantInterfaceRoutes
-                #      next_hop: {get_param: ManagementInterfaceDefaultRoute}
+                #      - - default: true
+                #          next_hop:
+                #            get_param: ManagementInterfaceDefaultRoute
 outputs:
   OS::stack_id:
     description: The OsNetConfigImpl resource.

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

@@ -37,7 +37,15 @@ parameters:
     description: default route for the {{network.name_lower}} network
     type: string
 {%- endif %}
-{% endfor %}
+  {{network.name}}InterfaceRoutes:
+    default: []
+    description: >
+      Routes for the {{network.name_lower}} 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
+{%- endfor %}
   DnsServers: # Override this via parameter_defaults
     default: []
     description: >
@@ -84,7 +92,9 @@ resources:
                     - - get_param: ControlPlaneIp
                       - get_param: ControlPlaneSubnetCidr
                 routes:
-                - ip_netmask: 169.254.169.254/32
+                  list_concat_unique:
+                    - get_param: ControlPlaneRoutes
+                    - - 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 %}
@@ -98,7 +108,7 @@ resources:
                 name: br-bond
 {%- else %}
                 name: bridge_name
-{% endif %}
+{%- endif %}
                 dns_servers:
                   get_param: DnsServers
                 members:
@@ -119,8 +129,10 @@ resources:
                   addresses:
                   - ip_netmask:
                       get_param: {{network.name}}IpSubnet
-{%- if network.name in role.default_route_networks %}
                   routes:
+                    list_concat_unique:
+                      - - get_param: {{network.name}}InterfaceRoutes
+{%- if network.name in role.default_route_networks %}
                         - default: true
                           next_hop:
                             get_param: {{network.name}}InterfaceDefaultRoute
@@ -149,9 +161,11 @@ resources:
                 addresses:
                 - ip_netmask:
                     get_param: {{network.name}}IpSubnet
-{%- if network.name in role.default_route_networks %}
                   routes:
-                  - default: true
+                    list_concat_unique:
+                      - get_param: {{network.name}}InterfaceRoutes
+{%- if network.name in role.default_route_networks %}
+                      - - default: true
                           next_hop:
                             get_param: {{network.name}}InterfaceDefaultRoute
 {%- endif %}

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

@@ -39,7 +39,15 @@ parameters:
     description: default route for the {{network.name_lower}} network
     type: string
 {%- endif %}
-{% endfor %}
+  {{network.name}}InterfaceRoutes:
+    default: []
+    description: >
+      Routes for the {{network.name_lower}} 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
+{%- endfor %}
   DnsServers: # Override this via parameter_defaults
     default: []
     description: >
@@ -88,18 +96,24 @@ resources:
                 addresses:
                 - ip_netmask:
                     get_param: StorageIpSubnet
+                routes:
+                  get_param: StorageInterfaceRoutes
               - type: interface
                 name: nic4
                 use_dhcp: false
                 addresses:
                 - ip_netmask:
                     get_param: InternalApiIpSubnet
+                routes:
+                  get_param: InternalApiInterfaceRoutes
               - type: ovs_bridge
                 name: br-tenant
                 use_dhcp: false
                 addresses:
                 - ip_netmask:
                     get_param: TenantIpSubnet
+                routes:
+                  get_param: TenantInterfaceRoutes
                 members:
                 - type: interface
                   name: nic5
@@ -118,17 +132,18 @@ resources:
             # Uncomment when including environments/network-management.yaml
             # If setting default route on the Management interface, comment
             # out the default route on the Control Plane.
-            #-
+            #- type: interface
-            #  type: interface
             #  name: nic7
             #  use_dhcp: false
             #  addresses:
-            #    -
+            #    - ip_netmask:
-            #      ip_netmask: {get_param: ManagementIpSubnet}
+            #        get_param: ManagementIpSubnet
             #  routes:
-            #    -
+            #    list_concat_unique:
-            #      default: true
+            #      - get_param: ManagementInterfaceRoutes
-            #      next_hop: {get_param: ManagementInterfaceDefaultRoute}
+            #      - - default: true
+            #          next_hop:
+            #            get_param: ManagementInterfaceDefaultRoute
 outputs:
   OS::stack_id:
     description: The OsNetConfigImpl resource.

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

@@ -38,7 +38,15 @@ parameters:
     description: default route for the {{network.name_lower}} network
     type: string
 {%- endif %}
-{% endfor %}
+  {{network.name}}InterfaceRoutes:
+    default: []
+    description: >
+      Routes for the {{network.name_lower}} 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
+{%- endfor %}
   DnsServers: # Override this via parameter_defaults
     default: []
     description: >
@@ -79,7 +87,7 @@ resources:
                   next_hop:
                     get_param: EC2MetadataIp
                 # IPv4 Default Route
-                - default: true
+                - default: true  # NOTE(hjensas): This is the IPv4 default route
                   next_hop:
                     get_param: ControlPlaneDefaultRoute
               - type: interface
@@ -88,24 +96,32 @@ resources:
                 addresses:
                 - ip_netmask:
                     get_param: StorageIpSubnet
+                routes:
+                  get_param: StorageInterfaceRoutes
               - type: interface
                 name: nic3
                 use_dhcp: false
                 addresses:
                 - ip_netmask:
                     get_param: StorageMgmtIpSubnet
+                routes:
+                  get_param: StorageMgmtInterfaceRoutes
               - type: interface
                 name: nic4
                 use_dhcp: false
                 addresses:
                 - ip_netmask:
                     get_param: InternalApiIpSubnet
+                routes:
+                  get_param: InternalApiInterfaceRoutes
               - type: ovs_bridge
                 name: br-tenant
                 use_dhcp: false
                 addresses:
                 - ip_netmask:
                     get_param: TenantIpSubnet
+                routes:
+                  get_param: TenantInterfaceRoutes
                 members:
                 - type: interface
                   name: nic5
@@ -120,7 +136,9 @@ resources:
                 - ip_netmask:
                     get_param: ExternalIpSubnet
                 routes:
-                - default: true
+                  list_concat_unique:
+                    - get_param: ExternalInterfaceRoutes
+                    - - default: true  # NOTE(hjensas): This is the IPv6 default route
                         next_hop:
                           get_param: ExternalInterfaceDefaultRoute
                 members:
@@ -131,17 +149,18 @@ resources:
             # 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.
-            #-
+            #- type: interface
-            #  type: interface
             #  name: nic7
             #  use_dhcp: false
             #  addresses:
-            #    -
+            #  - ip_netmask:
-            #      ip_netmask: {get_param: ManagementIpSubnet}
+            #      get_param: ManagementIpSubnet
             #  routes:
-            #    -
+            #    list_concat_unique:
-            #      default: true
+            #      - get_param: ManagementInterfaceRoutes
-            #      next_hop: {get_param: ManagementInterfaceDefaultRoute}
+            #      - - default: true
+            #          next_hop:
+            #            get_param: ManagementInterfaceDefaultRoute
 outputs:
   OS::stack_id:
     description: The OsNetConfigImpl resource.

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

@@ -37,7 +37,15 @@ parameters:
     description: default route for the {{network.name_lower}} network
     type: string
 {%- endif %}
-{% endfor %}
+  {{network.name}}InterfaceRoutes:
+    default: []
+    description: >
+      Routes for the {{network.name_lower}} 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
+{%- endfor %}
   DnsServers: # Override this via parameter_defaults
     default: []
     description: >
@@ -114,9 +122,11 @@ resources:
                 - ip_netmask:
                     get_param: {{network.name}}IpSubnet
 {%- endif %}
-{%- if network.name in role.default_route_networks %}
                 routes:
-                - default: true
+                    list_concat_unique:
+                      - get_param: {{network.name}}InterfaceRoutes
+{%- if network.name in role.default_route_networks %}
+                      - - default: true
                           next_hop:
                             get_param: {{network.name}}InterfaceDefaultRoute
 {%- endif %}

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

@@ -38,7 +38,15 @@ parameters:
     description: default route for the {{network.name_lower}} network
     type: string
 {%- endif %}
-{% endfor %}
+  {{network.name}}InterfaceRoutes:
+    default: []
+    description: >
+      Routes for the {{network.name_lower}} 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
+{%- endfor %}
   DnsServers: # Override this via parameter_defaults
     default: []
     description: >
@@ -78,7 +86,7 @@ resources:
                 - ip_netmask: 169.254.169.254/32
                   next_hop:
                     get_param: EC2MetadataIp
-                - default: true
+                - default: true  # NOTE(hjensas): This is the IPv4 default route
                   next_hop:
                     get_param: ControlPlaneDefaultRoute
                 members:
@@ -93,7 +101,9 @@ resources:
                 - ip_netmask:
                     get_param: ExternalIpSubnet
                 routes:
-                - default: true
+                  list_concat_unique:
+                    - get_param: ExternalInterfaceRoutes
+                    - - default: true  # NOTE(hjensas): This is the IPv6 default route
                         next_hop:
                           get_param: ExternalInterfaceDefaultRoute
               - type: vlan
@@ -103,6 +113,8 @@ resources:
                 addresses:
                 - ip_netmask:
                     get_param: InternalApiIpSubnet
+                routes:
+                  get_param: InternalApiInterfaceRoutes
               - type: vlan
                 vlan_id:
                   get_param: StorageNetworkVlanID
@@ -110,6 +122,8 @@ resources:
                 addresses:
                 - ip_netmask:
                     get_param: StorageIpSubnet
+                routes:
+                  get_param: StorageInterfaceRoutes
               - type: vlan
                 vlan_id:
                   get_param: StorageMgmtNetworkVlanID
@@ -117,6 +131,8 @@ resources:
                 addresses:
                 - ip_netmask:
                     get_param: StorageMgmtIpSubnet
+                routes:
+                  get_param: StorageMgmtInterfaceRoutes
               - type: vlan
                 vlan_id:
                   get_param: TenantNetworkVlanID
@@ -124,21 +140,25 @@ resources:
                 addresses:
                 - ip_netmask:
                     get_param: TenantIpSubnet
+                routes:
+                  get_param: TenantInterfaceRoutes
               # 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.
-              #-
+              #- type: vlan
-              #  type: vlan
+              #  vlan_id:
-              #  vlan_id: {get_param: ManagementNetworkVlanID}
+              #    get_param: ManagementNetworkVlanID
               #  device: bridge_name
               #  addresses:
-              #    -
+              #  - ip_netmask:
-              #      ip_netmask: {get_param: ManagementIpSubnet}
+              #      get_param: ManagementIpSubnet
               #  routes:
-              #    -
+              #    list_concat_unique:
-              #      default: true
+              #      - get_param: ManagementInterfaceRoutes
-              #      next_hop: {get_param: ManagementInterfaceDefaultRoute}
+              #      - - default: true
+              #          next_hop:
+              #            get_param: ManagementInterfaceDefaultRoute
 outputs:
   OS::stack_id:
     description: The OsNetConfigImpl resource.

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

@@ -37,7 +37,15 @@ parameters:
     description: default route for the {{network.name_lower}} network
     type: string
 {%- endif %}
-{% endfor %}
+  {{network.name}}InterfaceRoutes:
+    default: []
+    description: >
+      Routes for the {{network.name_lower}} 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
+{%- endfor %}
   DnsServers: # Override this via parameter_defaults
     default: []
     description: >
@@ -103,9 +111,11 @@ resources:
                 addresses:
                 - ip_netmask:
                     get_param: {{network.name}}IpSubnet
-{%- if network.name in role.default_route_networks %}
                 routes:
-                - default: true
+                    list_concat_unique:
+                      - get_param: {{network.name}}InterfaceRoutes
+{%- if network.name in role.default_route_networks %}
+                      - - default: true
                           next_hop:
                             get_param: {{network.name}}InterfaceDefaultRoute
 {%- endif %}

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

@@ -41,7 +41,15 @@ parameters:
     description: default route for the {{network.name_lower}} network
     type: string
 {%- endif %}
-{% endfor %}
+  {{network.name}}InterfaceRoutes:
+    default: []
+    description: >
+      Routes for the {{network.name_lower}} 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
+{%- endfor %}
   DnsServers: # Override this via parameter_defaults
     default: []
     description: >
@@ -96,6 +104,8 @@ resources:
                   addresses:
                   - ip_netmask:
                       get_param: {{network.name}}IpSubnet
+                  routes:
+                    get_param: {{network.name}}InterfaceRoutes
 {%- endfor %}
 outputs:
   OS::stack_id:

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

@@ -38,7 +38,15 @@ parameters:
     description: default route for the {{network.name_lower}} network
     type: string
 {%- endif %}
-{% endfor %}
+  {{network.name}}InterfaceRoutes:
+    default: []
+    description: >
+      Routes for the {{network.name_lower}} 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
+{%- endfor %}
   DnsServers: # Override this via parameter_defaults
     default: []
     description: >
@@ -78,7 +86,7 @@ resources:
                 - ip_netmask: 169.254.169.254/32
                   next_hop:
                     get_param: EC2MetadataIp
-                - default: true
+                - default: true  # NOTE(hjensas): This is the IPv4 default route
                   next_hop:
                     get_param: ControlPlaneDefaultRoute
                 members:
@@ -92,7 +100,9 @@ resources:
                   - ip_netmask:
                       get_param: ExternalIpSubnet
                   routes:
-                  - default: true
+                    list_concat_unique:
+                      - get_param: ExternalInterfaceRoutes
+                      - - default: true  # NOTE(hjensas): This is the IPv6 default route
                           next_hop:
                             get_param: ExternalInterfaceDefaultRoute
                 - type: vlan
@@ -101,38 +111,48 @@ resources:
                   addresses:
                   - ip_netmask:
                       get_param: InternalApiIpSubnet
+                  routes:
+                    get_param: InternalApiInterfaceRoutes
                 - type: vlan
                   vlan_id:
                     get_param: StorageNetworkVlanID
                   addresses:
                   - ip_netmask:
                       get_param: StorageIpSubnet
+                  routes:
+                    get_param: StorageInterfaceRoutes
                 - type: vlan
                   vlan_id:
                     get_param: StorageMgmtNetworkVlanID
                   addresses:
                   - ip_netmask:
                       get_param: StorageMgmtIpSubnet
+                  routes:
+                    get_param: StorageMgmtInterfaceRoutes
                 - type: vlan
                   vlan_id:
                     get_param: TenantNetworkVlanID
                   addresses:
                   - ip_netmask:
                       get_param: TenantIpSubnet
+                  routes:
+                    get_param: TenantInterfaceRoutes
                 # 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.
-                #-
+                #- type: vlan
-                #  type: vlan
+                #  vlan_id:
-                #  vlan_id: {get_param: ManagementNetworkVlanID}
+                #    get_param: ManagementNetworkVlanID
                 #  addresses:
-                #    -
+                #  - ip_netmask:
-                #      ip_netmask: {get_param: ManagementIpSubnet}
+                #      get_param: ManagementIpSubnet
                 #  routes:
-                #    -
+                #    list_concat_unique:
-                #      default: true
+                #      - get_param: ManagementInterfaceRoutes
-                #      next_hop: {get_param: ManagementInterfaceDefaultRoute}
+                #      - - default: true
+                #          next_hop:
+                #            get_param: ManagementInterfaceDefaultRoute
 outputs:
   OS::stack_id:
     description: The OsNetConfigImpl resource.

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

@@ -37,7 +37,15 @@ parameters:
     description: default route for the {{network.name_lower}} network
     type: string
 {%- endif %}
-{% endfor %}
+  {{network.name}}InterfaceRoutes:
+    default: []
+    description: >
+      Routes for the {{network.name_lower}} 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
+{%- endfor %}
   DnsServers: # Override this via parameter_defaults
     default: []
     description: >
@@ -98,9 +106,11 @@ resources:
                   addresses:
                   - ip_netmask:
                       get_param: {{network.name}}IpSubnet
-{%- if network.name in role.default_route_networks %}
                   routes:
-                  - default: true
+                    list_concat_unique:
+                      - get_param: {{network.name}}InterfaceRoutes
+{%- if network.name in role.default_route_networks %}
+                      - - default: true
                           next_hop:
                             get_param: {{network.name}}InterfaceDefaultRoute
 {%- endif %}

releasenotes/notes/add-interface-routes-in-nic-configs-1628993fcaf6095c.yaml

@@ -0,0 +1,8 @@
+---
+features:
+  - |
+    New parameter ``{{network.name}}InterfaceRoutes`` in network config
+    templates. Routes specified is configured on the overcloud node network
+    interfaces. The parameter takes a list of routes in JSON. For example::
+
+      [{'destination':'10.0.0.0/16', 'nexthop':'10.0.0.1'}]