From ef3315a3a30d531147e74f114777ca7706547543 Mon Sep 17 00:00:00 2001 From: Ben Nemec Date: Thu, 13 Dec 2018 10:03:45 -0600 Subject: [PATCH] Add ControlPlaneStaticRoutes to nic-configs TripleO just added another mandatory parameter so this is needed to use the templates with master. --- .../nic-configs/ceph-storage.yaml | 8 ++++++++ .../nic-configs/cinder-storage.yaml | 8 ++++++++ .../bond-network-templates-v2/nic-configs/compute.yaml | 8 ++++++++ .../bond-network-templates-v2/nic-configs/controller.yaml | 8 ++++++++ .../nic-configs/swift-storage.yaml | 8 ++++++++ .../nic-configs/ceph-storage.yaml | 8 ++++++++ .../nic-configs/cinder-storage.yaml | 8 ++++++++ .../ipv6-network-templates-v2/nic-configs/compute.yaml | 8 ++++++++ .../ipv6-network-templates-v2/nic-configs/controller.yaml | 8 ++++++++ .../nic-configs/swift-storage.yaml | 8 ++++++++ .../network-templates-v2/nic-configs/ceph-storage.yaml | 8 ++++++++ .../network-templates-v2/nic-configs/cinder-storage.yaml | 8 ++++++++ .../network-templates-v2/nic-configs/compute.yaml | 8 ++++++++ .../network-templates-v2/nic-configs/controller.yaml | 8 ++++++++ .../network-templates-v2/nic-configs/swift-storage.yaml | 8 ++++++++ 15 files changed, 120 insertions(+) diff --git a/overcloud-templates/bond-network-templates-v2/nic-configs/ceph-storage.yaml b/overcloud-templates/bond-network-templates-v2/nic-configs/ceph-storage.yaml index aec2f54..74153b3 100644 --- a/overcloud-templates/bond-network-templates-v2/nic-configs/ceph-storage.yaml +++ b/overcloud-templates/bond-network-templates-v2/nic-configs/ceph-storage.yaml @@ -117,6 +117,14 @@ parameters: ControlPlaneDefaultRoute: # Override this via parameter_defaults description: The default route of the control plane network. 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: A list of DNS servers (2 max for some implementations) that will be added to resolv.conf. diff --git a/overcloud-templates/bond-network-templates-v2/nic-configs/cinder-storage.yaml b/overcloud-templates/bond-network-templates-v2/nic-configs/cinder-storage.yaml index 30390bf..0ef1414 100644 --- a/overcloud-templates/bond-network-templates-v2/nic-configs/cinder-storage.yaml +++ b/overcloud-templates/bond-network-templates-v2/nic-configs/cinder-storage.yaml @@ -117,6 +117,14 @@ parameters: ControlPlaneDefaultRoute: # Override this via parameter_defaults description: The default route of the control plane network. 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: A list of DNS servers (2 max for some implementations) that will be added to resolv.conf. diff --git a/overcloud-templates/bond-network-templates-v2/nic-configs/compute.yaml b/overcloud-templates/bond-network-templates-v2/nic-configs/compute.yaml index f5363af..df5fb2b 100644 --- a/overcloud-templates/bond-network-templates-v2/nic-configs/compute.yaml +++ b/overcloud-templates/bond-network-templates-v2/nic-configs/compute.yaml @@ -117,6 +117,14 @@ parameters: ControlPlaneDefaultRoute: # Override this via parameter_defaults description: The default route of the control plane network. 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: A list of DNS servers (2 max for some implementations) that will be added to resolv.conf. diff --git a/overcloud-templates/bond-network-templates-v2/nic-configs/controller.yaml b/overcloud-templates/bond-network-templates-v2/nic-configs/controller.yaml index ac964aa..a00413e 100644 --- a/overcloud-templates/bond-network-templates-v2/nic-configs/controller.yaml +++ b/overcloud-templates/bond-network-templates-v2/nic-configs/controller.yaml @@ -117,6 +117,14 @@ parameters: ControlPlaneDefaultRoute: # Override this via parameter_defaults description: The default route of the control plane network. 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: A list of DNS servers (2 max for some implementations) that will be added to resolv.conf. diff --git a/overcloud-templates/bond-network-templates-v2/nic-configs/swift-storage.yaml b/overcloud-templates/bond-network-templates-v2/nic-configs/swift-storage.yaml index 30390bf..0ef1414 100644 --- a/overcloud-templates/bond-network-templates-v2/nic-configs/swift-storage.yaml +++ b/overcloud-templates/bond-network-templates-v2/nic-configs/swift-storage.yaml @@ -117,6 +117,14 @@ parameters: ControlPlaneDefaultRoute: # Override this via parameter_defaults description: The default route of the control plane network. 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: A list of DNS servers (2 max for some implementations) that will be added to resolv.conf. diff --git a/overcloud-templates/ipv6-network-templates-v2/nic-configs/ceph-storage.yaml b/overcloud-templates/ipv6-network-templates-v2/nic-configs/ceph-storage.yaml index 0de80d4..fe66405 100644 --- a/overcloud-templates/ipv6-network-templates-v2/nic-configs/ceph-storage.yaml +++ b/overcloud-templates/ipv6-network-templates-v2/nic-configs/ceph-storage.yaml @@ -117,6 +117,14 @@ parameters: ControlPlaneDefaultRoute: # Override this via parameter_defaults description: The default route of the control plane network. 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: A list of DNS servers (2 max for some implementations) that will be added to resolv.conf. diff --git a/overcloud-templates/ipv6-network-templates-v2/nic-configs/cinder-storage.yaml b/overcloud-templates/ipv6-network-templates-v2/nic-configs/cinder-storage.yaml index 30390bf..0ef1414 100644 --- a/overcloud-templates/ipv6-network-templates-v2/nic-configs/cinder-storage.yaml +++ b/overcloud-templates/ipv6-network-templates-v2/nic-configs/cinder-storage.yaml @@ -117,6 +117,14 @@ parameters: ControlPlaneDefaultRoute: # Override this via parameter_defaults description: The default route of the control plane network. 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: A list of DNS servers (2 max for some implementations) that will be added to resolv.conf. diff --git a/overcloud-templates/ipv6-network-templates-v2/nic-configs/compute.yaml b/overcloud-templates/ipv6-network-templates-v2/nic-configs/compute.yaml index 45fb468..0b2974c 100644 --- a/overcloud-templates/ipv6-network-templates-v2/nic-configs/compute.yaml +++ b/overcloud-templates/ipv6-network-templates-v2/nic-configs/compute.yaml @@ -117,6 +117,14 @@ parameters: ControlPlaneDefaultRoute: # Override this via parameter_defaults description: The default route of the control plane network. 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: A list of DNS servers (2 max for some implementations) that will be added to resolv.conf. diff --git a/overcloud-templates/ipv6-network-templates-v2/nic-configs/controller.yaml b/overcloud-templates/ipv6-network-templates-v2/nic-configs/controller.yaml index 903565a..5c790b7 100644 --- a/overcloud-templates/ipv6-network-templates-v2/nic-configs/controller.yaml +++ b/overcloud-templates/ipv6-network-templates-v2/nic-configs/controller.yaml @@ -117,6 +117,14 @@ parameters: ControlPlaneDefaultRoute: # Override this via parameter_defaults description: The default route of the control plane network. 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: A list of DNS servers (2 max for some implementations) that will be added to resolv.conf. diff --git a/overcloud-templates/ipv6-network-templates-v2/nic-configs/swift-storage.yaml b/overcloud-templates/ipv6-network-templates-v2/nic-configs/swift-storage.yaml index 30390bf..0ef1414 100644 --- a/overcloud-templates/ipv6-network-templates-v2/nic-configs/swift-storage.yaml +++ b/overcloud-templates/ipv6-network-templates-v2/nic-configs/swift-storage.yaml @@ -117,6 +117,14 @@ parameters: ControlPlaneDefaultRoute: # Override this via parameter_defaults description: The default route of the control plane network. 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: A list of DNS servers (2 max for some implementations) that will be added to resolv.conf. diff --git a/overcloud-templates/network-templates-v2/nic-configs/ceph-storage.yaml b/overcloud-templates/network-templates-v2/nic-configs/ceph-storage.yaml index 8fb0f3d..de56eb5 100644 --- a/overcloud-templates/network-templates-v2/nic-configs/ceph-storage.yaml +++ b/overcloud-templates/network-templates-v2/nic-configs/ceph-storage.yaml @@ -117,6 +117,14 @@ parameters: ControlPlaneDefaultRoute: # Override this via parameter_defaults description: The default route of the control plane network. 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: A list of DNS servers (2 max for some implementations) that will be added to resolv.conf. diff --git a/overcloud-templates/network-templates-v2/nic-configs/cinder-storage.yaml b/overcloud-templates/network-templates-v2/nic-configs/cinder-storage.yaml index 30390bf..0ef1414 100644 --- a/overcloud-templates/network-templates-v2/nic-configs/cinder-storage.yaml +++ b/overcloud-templates/network-templates-v2/nic-configs/cinder-storage.yaml @@ -117,6 +117,14 @@ parameters: ControlPlaneDefaultRoute: # Override this via parameter_defaults description: The default route of the control plane network. 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: A list of DNS servers (2 max for some implementations) that will be added to resolv.conf. diff --git a/overcloud-templates/network-templates-v2/nic-configs/compute.yaml b/overcloud-templates/network-templates-v2/nic-configs/compute.yaml index eb5dbee..05cf854 100644 --- a/overcloud-templates/network-templates-v2/nic-configs/compute.yaml +++ b/overcloud-templates/network-templates-v2/nic-configs/compute.yaml @@ -117,6 +117,14 @@ parameters: ControlPlaneDefaultRoute: # Override this via parameter_defaults description: The default route of the control plane network. 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: A list of DNS servers (2 max for some implementations) that will be added to resolv.conf. diff --git a/overcloud-templates/network-templates-v2/nic-configs/controller.yaml b/overcloud-templates/network-templates-v2/nic-configs/controller.yaml index 2fb77c2..80143f7 100644 --- a/overcloud-templates/network-templates-v2/nic-configs/controller.yaml +++ b/overcloud-templates/network-templates-v2/nic-configs/controller.yaml @@ -117,6 +117,14 @@ parameters: ControlPlaneDefaultRoute: # Override this via parameter_defaults description: The default route of the control plane network. 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: A list of DNS servers (2 max for some implementations) that will be added to resolv.conf. diff --git a/overcloud-templates/network-templates-v2/nic-configs/swift-storage.yaml b/overcloud-templates/network-templates-v2/nic-configs/swift-storage.yaml index 30390bf..0ef1414 100644 --- a/overcloud-templates/network-templates-v2/nic-configs/swift-storage.yaml +++ b/overcloud-templates/network-templates-v2/nic-configs/swift-storage.yaml @@ -117,6 +117,14 @@ parameters: ControlPlaneDefaultRoute: # Override this via parameter_defaults description: The default route of the control plane network. 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: A list of DNS servers (2 max for some implementations) that will be added to resolv.conf.