3 Commits

Author SHA1 Message Date
melissaml
c03987f23e Remove the duplicated word
Change-Id: Id5110538ea877c2fea33066b88e474933eec99f7
2018-08-22 23:49:07 +08:00
Jill Rouleau
6a1ac35275 DeployedServer support for cidr via get_attr
Change I92ee0f9a2107cdf1ca5903d3756a235a79c36c73 implemented a
conditional for ControlPlaneSubnetCidr to be resolved using get_attr
and a str_split. DeployedServer documentation specifies that this
value should be provided to DeployedServerPortMap as a numeric value
(ie; 24) rather than full cidr (ie; 192.168.24.0/24), which causes the
str_split to fail.

This change provides support for both via a yaql expression, and adds
a deprecation note to switch to the full cidr format.

Change-Id: I6d4422b4f1aa52aee2954eb447008d3d24fe8736
2018-08-07 09:53:06 -07:00
Harald Jensås
6ab86a3ebe ControlPlaneSubnetCidr using get_attr
Use get_attr on the server resource to resolve attribute
value from the subnet(s) and pass it to the parameter
'ControlPlaneSubnetCidr' used in the THT/network/config/*
templates.

As the value is now resolved from resource attributes,
this changes the default for 'ControlPlaneSubnetCidr' to ''
as well as the comment that these value should be overriden
in parameters_defaults. It also removes the parameter from
network-environment templates.

A conditinal is used in  puppet/role.role.j2.yaml so that
the parameter value is used whenever it is not '' (the
default) to provide backwards compatibility in case the user
set a different value (different from the one used in
undercloud.conf) for this parameter in
network-environment.yaml.

When deploying a routed control plane the network config
templates would previously need to be updated to carry
'ControlPlaneXSubnetCidr' parameter (in case the subnet
mask is not the same for all the routed network leafs).
With 8 Leafs in addition to the network local to the
undercloud that is 8 parameters less to place in the
configuration. By getting the value to pass from the
server resource this change reduces the required nic-config
template customisation (reduces the risk of user error).

Partial: blueprint tripleo-routed-networks-templates
Change-Id: I92ee0f9a2107cdf1ca5903d3756a235a79c36c73
2018-07-14 09:11:28 +02:00