Merge "Add static routes for routed ctlplane"

environments/undercloud.yaml

@@ -81,3 +81,12 @@ parameter_defaults:
   NeutronPortQuota: '-1'
   MigrateLegacyNeutronDb: true
   SwiftCorsAllowedOrigin: '*'
+  # A list of static routes for the control plane network. Ensure traffic to
+  # nodes on remote control plane networks use the correct network path.
+  # Example:
+  #   ControlPlaneStaticRoutes:
+  #     - ip_netmask: 192.168.25.0/24
+  #       next_hop: 192.168.24.1
+  #     - ip_netmask: 192.168.26.0/24
+  #       next_hop: 192.168.24.1
+  ControlPlaneStaticRoutes: []

net-config-undercloud.j2.yaml

@@ -17,6 +17,10 @@ parameters:
     default: '24'
     description: The subnet CIDR of the control plane network.
     type: string
+  ControlPlaneStaticRoutes:
+    default: []
+    description: A list of static routes
+    type: json
   DnsServers: # Override this via parameter_defaults
     default: []
     description: A list of DNS servers (2 max for some implementations) that will be added to resolv.conf.
@@ -53,6 +57,7 @@ resources:
                     - /
                     - - get_param: ControlPlaneIp
                       - get_param: ControlPlaneSubnetCidr
+                routes: {get_param: ControlPlaneStaticRoutes}
                 members:
                 - type: interface
                   name: interface_name