openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "ControlPlaneDefaultRoute using get_attr"

This commit is contained in:
Zuul 2018-07-24 01:34:22 +00:00 committed by Gerrit Code Review
parent dfc09b6ff1 c649cf0545
commit ad5d4d1db1
45 changed files with 203 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ci/common/net-config-multinode-os-net-config.yaml
View File

@ -43,6 +43,11 @@ parameters:
The subnet CIDR of the control plane network. (The parameter is
automatically resolved from the ctlplane subnet's cidr attribute.)
type: string
ControlPlaneDefaultRoute:
default: ''
description: The default route of the control plane network. (The parameter
is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
type: string
OvSBridgeMtu:
default: 1300
description: The mtu of the OvS bridge

5
ci/common/net-config-multinode.yaml
View File

@ -43,6 +43,11 @@ parameters:
The subnet CIDR of the control plane network. (The parameter is
automatically resolved from the ctlplane subnet's cidr attribute.)
type: string
ControlPlaneDefaultRoute:
default: ''
description: The default route of the control plane network. (The parameter
is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
type: string
resources:
OsNetConfigImpl:

5
ci/common/net-config-simple-bridge.yaml
View File

@ -12,6 +12,11 @@ parameters:
The subnet CIDR of the control plane network. (The parameter is
automatically resolved from the ctlplane subnet's cidr attribute.)
type: string
ControlPlaneDefaultRoute:
default: ''
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

1
ci/environments/network/multiple-nics-ipv6/network-environment.yaml
View File

@ -7,7 +7,6 @@ resource_registry:
OS::TripleO::CephStorage::Net::SoftwareConfig: nic-configs/ceph-storage.yaml
parameter_defaults:
ControlPlaneDefaultRoute: 192.168.24.1
EC2MetadataIp: 192.168.24.1
ExternalNetCidr: 2001:db8:fd00:1000::/64
ExternalAllocationPools: [{"start": "2001:db8:fd00:1000::10", "end": "2001:db8:fd00:1000:ffff:ffff:ffff:fffe"}]

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

@ -68,8 +68,10 @@ parameters:
The subnet CIDR of the control plane network. (The parameter is
automatically resolved from the ctlplane subnet's cidr attribute.)
type: string
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
ControlPlaneDefaultRoute:
default: ''
description: The default route of the control plane network. (The parameter
is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
type: string
DnsServers: # Override this via parameter_defaults
default: []

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

@ -68,8 +68,10 @@ parameters:
The subnet CIDR of the control plane network. (The parameter is
automatically resolved from the ctlplane subnet's cidr attribute.)
type: string
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
ControlPlaneDefaultRoute:
default: ''
description: The default route of the control plane network. (The parameter
is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
type: string
DnsServers: # Override this via parameter_defaults
default: []

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

@ -68,8 +68,10 @@ parameters:
The subnet CIDR of the control plane network. (The parameter is
automatically resolved from the ctlplane subnet's cidr attribute.)
type: string
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
ControlPlaneDefaultRoute:
default: ''
description: The default route of the control plane network. (The parameter
is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
type: string
DnsServers: # Override this via parameter_defaults
default: []

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

@ -68,8 +68,10 @@ parameters:
The subnet CIDR of the control plane network. (The parameter is
automatically resolved from the ctlplane subnet's cidr attribute.)
type: string
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
ControlPlaneDefaultRoute:
default: ''
description: The default route of the control plane network. (The parameter
is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
type: string
DnsServers: # Override this via parameter_defaults
default: []

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

@ -68,8 +68,10 @@ parameters:
The subnet CIDR of the control plane network. (The parameter is
automatically resolved from the ctlplane subnet's cidr attribute.)
type: string
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
ControlPlaneDefaultRoute:
default: ''
description: The default route of the control plane network. (The parameter
is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
type: string
DnsServers: # Override this via parameter_defaults
default: []

1
ci/environments/network/multiple-nics/network-environment.yaml
View File

@ -7,7 +7,6 @@ resource_registry:
OS::TripleO::CephStorage::Net::SoftwareConfig: nic-configs/ceph-storage.yaml
parameter_defaults:
ControlPlaneDefaultRoute: 192.168.24.1
EC2MetadataIp: 192.168.24.1
ExternalNetCidr: 10.0.0.0/24
ExternalAllocationPools: [{"start": "10.0.0.10", "end": "10.0.0.50"}]

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

@ -68,8 +68,10 @@ parameters:
The subnet CIDR of the control plane network. (The parameter is
automatically resolved from the ctlplane subnet's cidr attribute.)
type: string
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
ControlPlaneDefaultRoute:
default: ''
description: The default route of the control plane network. (The parameter
is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
type: string
DnsServers: # Override this via parameter_defaults
default: []

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

@ -68,8 +68,10 @@ parameters:
The subnet CIDR of the control plane network. (The parameter is
automatically resolved from the ctlplane subnet's cidr attribute.)
type: string
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
ControlPlaneDefaultRoute:
default: ''
description: The default route of the control plane network. (The parameter
is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
type: string
DnsServers: # Override this via parameter_defaults
default: []

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

@ -68,8 +68,10 @@ parameters:
The subnet CIDR of the control plane network. (The parameter is
automatically resolved from the ctlplane subnet's cidr attribute.)
type: string
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
ControlPlaneDefaultRoute:
default: ''
description: The default route of the control plane network. (The parameter
is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
type: string
DnsServers: # Override this via parameter_defaults
default: []

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

@ -68,8 +68,10 @@ parameters:
The subnet CIDR of the control plane network. (The parameter is
automatically resolved from the ctlplane subnet's cidr attribute.)
type: string
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
ControlPlaneDefaultRoute:
default: ''
description: The default route of the control plane network. (The parameter
is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
type: string
DnsServers: # Override this via parameter_defaults
default: []

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

@ -68,8 +68,10 @@ parameters:
The subnet CIDR of the control plane network. (The parameter is
automatically resolved from the ctlplane subnet's cidr attribute.)
type: string
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
ControlPlaneDefaultRoute:
default: ''
description: The default route of the control plane network. (The parameter
is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
type: string
DnsServers: # Override this via parameter_defaults
default: []

1
ci/environments/network/public-bond/network-environment.yaml
View File

@ -7,7 +7,6 @@ resource_registry:
OS::TripleO::CephStorage::Net::SoftwareConfig: nic-configs/ceph-storage.yaml
parameter_defaults:
ControlPlaneDefaultRoute: 192.168.24.1
EC2MetadataIp: 192.168.24.1
ExternalNetCidr: 10.0.0.0/24
ExternalAllocationPools: [{"start": "10.0.0.10", "end": "10.0.0.50"}]

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

@ -68,8 +68,10 @@ parameters:
The subnet CIDR of the control plane network. (The parameter is
automatically resolved from the ctlplane subnet's cidr attribute.)
type: string
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
ControlPlaneDefaultRoute:
default: ''
description: The default route of the control plane network. (The parameter
is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
type: string
DnsServers: # Override this via parameter_defaults
default: []

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

@ -68,8 +68,10 @@ parameters:
The subnet CIDR of the control plane network. (The parameter is
automatically resolved from the ctlplane subnet's cidr attribute.)
type: string
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
ControlPlaneDefaultRoute:
default: ''
description: The default route of the control plane network. (The parameter
is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
type: string
DnsServers: # Override this via parameter_defaults
default: []

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

@ -68,8 +68,10 @@ parameters:
The subnet CIDR of the control plane network. (The parameter is
automatically resolved from the ctlplane subnet's cidr attribute.)
type: string
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
ControlPlaneDefaultRoute:
default: ''
description: The default route of the control plane network. (The parameter
is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
type: string
DnsServers: # Override this via parameter_defaults
default: []

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

@ -68,8 +68,10 @@ parameters:
The subnet CIDR of the control plane network. (The parameter is
automatically resolved from the ctlplane subnet's cidr attribute.)
type: string
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
ControlPlaneDefaultRoute:
default: ''
description: The default route of the control plane network. (The parameter
is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
type: string
DnsServers: # Override this via parameter_defaults
default: []

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

@ -68,8 +68,10 @@ parameters:
The subnet CIDR of the control plane network. (The parameter is
automatically resolved from the ctlplane subnet's cidr attribute.)
type: string
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
ControlPlaneDefaultRoute:
default: ''
description: The default route of the control plane network. (The parameter
is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
type: string
DnsServers: # Override this via parameter_defaults
default: []

5
environments/network-environment-v6.j2.yaml
View File

@ -21,9 +21,10 @@ parameter_defaults:
# ControlPlaneSubnetCidr: It is no longer a requirement to provide this
# parameter. The attribute is resolved from the
# ctlplane subnet(s).
# ControlPlaneDefaultRoute: It is no longer a requirement to provide this
# parameter. The attribute is resolved from the
# ctlplane subnet(s).
#
# Gateway router for the provisioning network (or Undercloud IP)
ControlPlaneDefaultRoute: 192.168.24.254
EC2MetadataIp: 192.168.24.1 # Generally the IP of the Undercloud
{% for network in networks if network.enabled|default(true) %}
{%- if network.name != 'Tenant' %}

5
environments/network-environment.j2.yaml
View File

@ -17,9 +17,10 @@ parameter_defaults:
# ControlPlaneSubnetCidr: It is no longer a requirement to provide the
# parameter. The attribute is resolved from the
# ctlplane subnet(s).
# ControlPlaneDefaultRoute: It is no longer a requirement to provide this
# parameter. The attribute is resolved from the
# ctlplane subnet(s).
#
# Gateway router for the provisioning network (or Undercloud IP)
ControlPlaneDefaultRoute: 192.168.24.254
EC2MetadataIp: 192.168.24.1 # Generally the IP of the Undercloud
{% for network in networks if network.enabled|default(true) %}
# Customize the IP subnet to match the local environment

5
net-config-bond.j2.yaml
View File

@ -22,6 +22,11 @@ parameters:
The subnet CIDR of the control plane network. (The parameter is
automatically resolved from the ctlplane subnet's cidr attribute.)
type: string
ControlPlaneDefaultRoute:
default: ''
description: The default route of the control plane network. (The parameter
is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
type: string
{%- for network in networks %}
{{network.name}}IpSubnet:
default: ''

5
net-config-bridge.j2.yaml
View File

@ -12,6 +12,11 @@ parameters:
The subnet CIDR of the control plane network. (The parameter is
automatically resolved from the ctlplane subnet's cidr attribute.)
type: string
ControlPlaneDefaultRoute:
default: ''
description: The default route of the control plane network. (The parameter
is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
type: string
{%- for network in networks %}
{{network.name}}IpSubnet:
default: ''

5
net-config-linux-bridge.j2.yaml
View File

@ -12,8 +12,9 @@ parameters:
description: IP address/subnet on the {{network.name_lower}} network
type: string
{%- endfor %}
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
ControlPlaneDefaultRoute:
description: The default route of the control plane network. (The parameter
is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
type: string
default: 192.168.24.1
ControlPlaneSubnetCidr:

5
net-config-noop.j2.yaml
View File

@ -15,6 +15,11 @@ parameters:
The subnet CIDR of the control plane network. (The parameter is
automatically resolved from the ctlplane subnet's cidr attribute.)
type: string
ControlPlaneDefaultRoute:
default: ''
description: The default route of the control plane network. (The parameter
is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
type: string
{%- for network in networks %}
{{network.name}}IpSubnet:
default: ''

5
net-config-standalone.j2.yaml
View File

@ -19,6 +19,11 @@ parameters:
The subnet CIDR of the control plane network. (The parameter is
automatically resolved from the ctlplane subnet's cidr attribute.)
type: string
ControlPlaneDefaultRoute:
default: ''
description: The default route of the control plane network. (The parameter
is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
type: string
ControlPlaneStaticRoutes:
default: []
description: A list of static routes

6
net-config-static-bridge-with-external-dhcp.j2.yaml
View File

@ -19,8 +19,10 @@ parameters:
The subnet CIDR of the control plane network. (The parameter is
automatically resolved from the ctlplane subnet's cidr attribute.)
type: string
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
ControlPlaneDefaultRoute:
default: ''
description: The default route of the control plane network. (The parameter
is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
type: string
DnsServers: # Override this via parameter_defaults
default: []

6
net-config-static-bridge.j2.yaml
View File

@ -19,8 +19,10 @@ parameters:
The subnet CIDR of the control plane network. (The parameter is
automatically resolved from the ctlplane subnet's cidr attribute.)
type: string
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
ControlPlaneDefaultRoute:
default: ''
description: The default route of the control plane network. (The parameter
is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
type: string
DnsServers: # Override this via parameter_defaults
default: []

6
net-config-static.j2.yaml
View File

@ -18,8 +18,10 @@ parameters:
The subnet CIDR of the control plane network. (The parameter is
automatically resolved from the ctlplane subnet's cidr attribute.)
type: string
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
ControlPlaneDefaultRoute:
default: ''
description: The default route of the control plane network. (The parameter
is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
type: string
DnsServers: # Override this via parameter_defaults
default: []

5
net-config-undercloud.j2.yaml
View File

@ -19,6 +19,11 @@ parameters:
The subnet CIDR of the control plane network. (The parameter is
automatically resolved from the ctlplane subnet's cidr attribute.)
type: string
ControlPlaneDefaultRoute:
default: ''
description: The default route of the control plane network. (The parameter
is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
type: string
ControlPlaneStaticRoutes:
default: []
description: A list of static routes

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

@ -16,8 +16,10 @@ parameters:
The subnet CIDR of the control plane network. (The parameter is
automatically resolved from the ctlplane subnet's cidr attribute.)
type: string
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
ControlPlaneDefaultRoute:
default: ''
description: The default route of the control plane network. (The parameter
is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
type: string
{% for network in networks %}
{{network.name}}IpSubnet:

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

@ -14,8 +14,10 @@ parameters:
The subnet CIDR of the control plane network. (The parameter is
automatically resolved from the ctlplane subnet's cidr attribute.)
type: string
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
ControlPlaneDefaultRoute:
default: ''
description: The default route of the control plane network. (The parameter
is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
type: string
{% for network in networks %}
{{network.name}}IpSubnet:

6
network/config/bond-with-vlans/role.role.j2.yaml
View File

@ -12,8 +12,10 @@ parameters:
The subnet CIDR of the control plane network. (The parameter is
automatically resolved from the ctlplane subnet's cidr attribute.)
type: string
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
ControlPlaneDefaultRoute:
default: ''
description: The default route of the control plane network. (The parameter
is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
type: string
{% for network in networks %}
{{network.name}}IpSubnet:

6
network/config/multiple-nics/compute-dvr.j2.yaml
View File

@ -14,8 +14,10 @@ parameters:
The subnet CIDR of the control plane network. (The parameter is
automatically resolved from the ctlplane subnet's cidr attribute.)
type: string
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
ControlPlaneDefaultRoute:
default: ''
description: The default route of the control plane network. (The parameter
is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
type: string
{% for network in networks %}
{{network.name}}IpSubnet:

6
network/config/multiple-nics/controller-v6.j2.yaml
View File

@ -13,8 +13,10 @@ parameters:
The subnet CIDR of the control plane network. (The parameter is
automatically resolved from the ctlplane subnet's cidr attribute.)
type: string
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
ControlPlaneDefaultRoute:
default: ''
description: The default route of the control plane network. (The parameter
is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
type: string
{% for network in networks %}
{{network.name}}IpSubnet:

6
network/config/multiple-nics/role.role.j2.yaml
View File

@ -12,8 +12,10 @@ parameters:
The subnet CIDR of the control plane network. (The parameter is
automatically resolved from the ctlplane subnet's cidr attribute.)
type: string
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
ControlPlaneDefaultRoute:
default: ''
description: The default route of the control plane network. (The parameter
is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
type: string
{% for network in networks %}
{{network.name}}IpSubnet:

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

@ -13,8 +13,10 @@ parameters:
The subnet CIDR of the control plane network. (The parameter is
automatically resolved from the ctlplane subnet's cidr attribute.)
type: string
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
ControlPlaneDefaultRoute:
default: ''
description: The default route of the control plane network. (The parameter
is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
type: string
{% for network in networks %}
{{network.name}}IpSubnet:

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

@ -12,8 +12,10 @@ parameters:
The subnet CIDR of the control plane network. (The parameter is
automatically resolved from the ctlplane subnet's cidr attribute.)
type: string
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
ControlPlaneDefaultRoute:
default: ''
description: The default route of the control plane network. (The parameter
is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
type: string
{% for network in networks %}
{{network.name}}IpSubnet:

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

@ -16,8 +16,10 @@ parameters:
The subnet CIDR of the control plane network. (The parameter is
automatically resolved from the ctlplane subnet's cidr attribute.)
type: string
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
ControlPlaneDefaultRoute:
default: ''
description: The default route of the control plane network. (The parameter
is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
type: string
{% for network in networks %}
{{network.name}}IpSubnet:

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

@ -13,8 +13,10 @@ parameters:
The subnet CIDR of the control plane network. (The parameter is
automatically resolved from the ctlplane subnet's cidr attribute.)
type: string
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
ControlPlaneDefaultRoute:
default: ''
description: The default route of the control plane network. (The parameter
is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
type: string
{% for network in networks %}
{{network.name}}IpSubnet:

6
network/config/single-nic-vlans/role.role.j2.yaml
View File

@ -12,8 +12,10 @@ parameters:
The subnet CIDR of the control plane network. (The parameter is
automatically resolved from the ctlplane subnet's cidr attribute.)
type: string
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
ControlPlaneDefaultRoute:
default: ''
description: The default route of the control plane network. (The parameter
is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
type: string
{% for network in networks %}
{{network.name}}IpSubnet:

13
puppet/role.role.j2.yaml
View File

@ -250,6 +250,11 @@ parameters:
The subnet CIDR of the control plane network. (The parameter is
automatically resolved from the ctlplane subnet's cidr attribute.)
type: string
ControlPlaneDefaultRoute:
default: ''
description: The default route of the control plane network. (The parameter
is automatically resolved from the ctlplane subnet's gateway_ip attribute.)
type: string
ServerDeletionPolicy:
description: Whether to retain or delete servers on deletion of the stack
@ -324,6 +329,9 @@ conditions:
ctlplane_subnet_cidr_set:
not:
equals: [{get_param: ControlPlaneSubnetCidr}, '']
ctlplane_default_route_set:
not:
equals: [{get_param: ControlPlaneDefaultRoute}, '']
resources:
{{server_resource_name}}:
@ -456,6 +464,11 @@ resources:
- ctlplane_subnet_cidr_set
- {get_param: ControlPlaneSubnetCidr}
- {str_split: ['/', {get_attr: [{{server_resource_name}}, addresses, ctlplane, 0, subnets, 0, cidr]}, 1]}
ControlPlaneDefaultRoute:
if:
- ctlplane_default_route_set
- {get_param: ControlPlaneDefaultRoute}
- {get_attr: [{{server_resource_name}}, addresses, ctlplane, 0, subnets, 0, gateway_ip]}
{%- for network in networks %}
{{network.name}}IpSubnet: {get_attr: [{{network.name}}Port, ip_subnet]}
{%- endfor %}

25
releasenotes/notes/use-subnet-attrs-ctlplane-default-route-625ef5e414a65f2e.yaml Normal file
View File

@ -0,0 +1,25 @@
---
features:
- |
It is no longer a requirement to provide the parameter:
``ControlPlaneDefaultRoute`` in the environment when deploying. Now
``get_attr`` on the server resource is used to resolve the value from the
``ctlplane`` subnet's ``gateway_ip`` attribute. A conditional is used to
determine if the user provided the parameter in the environment. If the
user provided the parameter, the user provided value is used.
upgrade:
- |
Since the the ``ControlPlaneDefaultRoute`` can now be resolved from the
``ctlplane`` subnet(s) this parameter can be removed from the environment
(``network-environment.yaml``).
.. Note:: Prior to removing the parameter ensure that the property of
the ``ctlplane`` subnet(s) is correct. In case it is not, update
``undercloud.conf`` with the correct configuration and re-run the
``openstack undercloud install`` command to ensure the property
is set correctly.
.. Note:: ``ControlPlaneDefaultRoute`` is now passed to the network config
template when the resource is created. Because of this the
parameter must be defined in the network config template, even if
it is not used.