Merge "DeployedServer support for cidr via get_attr"
This commit is contained in:
commit
f403596657
@ -463,7 +463,12 @@ resources:
|
||||
if:
|
||||
- ctlplane_subnet_cidr_set
|
||||
- {get_param: ControlPlaneSubnetCidr}
|
||||
- {str_split: ['/', {get_attr: [{{server_resource_name}}, addresses, ctlplane, 0, subnets, 0, cidr]}, 1]}
|
||||
# DeployedServer docs specify 'cidr: 24' in DeployedServerPortMap.
|
||||
# Support both that, and 'cidr: 192.168.24.0/24'.
|
||||
- yaql:
|
||||
expression: str("{0}".format($.data).split("/")[-1])
|
||||
data: {get_attr: [{{server_resource_name}}, addresses, ctlplane, 0, subnets, 0, cidr]}
|
||||
|
||||
IPPool:
|
||||
map_merge:
|
||||
{%- if role.deprecated_param_ips is defined %}
|
||||
@ -481,7 +486,10 @@ resources:
|
||||
if:
|
||||
- ctlplane_subnet_cidr_set
|
||||
- {get_param: ControlPlaneSubnetCidr}
|
||||
- {str_split: ['/', {get_attr: [{{server_resource_name}}, addresses, ctlplane, 0, subnets, 0, cidr]}, 1]}
|
||||
- yaql:
|
||||
expression: str("{0}".format($.data).split("/")[-1])
|
||||
data: {get_attr: [{{server_resource_name}}, addresses, ctlplane, 0, subnets, 0, cidr]}
|
||||
|
||||
ControlPlaneDefaultRoute:
|
||||
if:
|
||||
- ctlplane_default_route_set
|
||||
@ -514,7 +522,11 @@ resources:
|
||||
if:
|
||||
- ctlplane_subnet_cidr_set
|
||||
- {get_param: ControlPlaneSubnetCidr}
|
||||
- {str_split: ['/', {get_attr: [{{server_resource_name}}, addresses, ctlplane, 0, subnets, 0, cidr]}, 1]}
|
||||
- yaql:
|
||||
expression: str("{0}".format($.data).split("/")[-1])
|
||||
data: {get_attr: [{{server_resource_name}}, addresses, ctlplane, 0, subnets, 0, cidr]}
|
||||
|
||||
|
||||
{%- for network in networks %}
|
||||
{{network.name}}Ip: {get_attr: [{{network.name}}Port, ip_address]}
|
||||
{{network.name}}IpSubnet: {get_attr: [{{network.name}}Port, ip_subnet]}
|
||||
|
@ -23,3 +23,15 @@ upgrade:
|
||||
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.
|
||||
deprecation:
|
||||
- |
|
||||
When using deployed-server, the cidr must now be specified in full cidr
|
||||
notation. Network size alone (cidr:: 24) is deprecated..
|
||||
For example::
|
||||
DeployedServerPortMap:
|
||||
control_virtual_ip:
|
||||
fixed_ips:
|
||||
- ip_address: 192.168.100.1
|
||||
subnets:
|
||||
- cidr: 192.168.100.0/24
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user