096b5d973e
Use the jinja2 string concatenation operator. The issue affected only cases where roles in roles_data.yaml didn't have deprecated_nic_config_name defined. Closes-Bug: #1752808 Change-Id: I452fe5f387732114d4c4ab8951f03622931ed780
17 lines
921 B
YAML
17 lines
921 B
YAML
# This template configures each role to use a pair of bonded nics (nic2 and
|
|
# nic3) and configures an IP address on each relevant isolated network
|
|
# for each role, with IPv6 on the External network. This template assumes
|
|
# use of network-isolation-v6.yaml.
|
|
#
|
|
# FIXME: if/when we add functionality to heatclient to include heat
|
|
# environment files we should think about using it here to automatically
|
|
# include network-isolation-v6.yaml.
|
|
resource_registry:
|
|
{%- for role in roles if role != "Controller" %}
|
|
# Port assignments for the {{role.name}}
|
|
OS::TripleO::{{role.name}}::Net::SoftwareConfig: ../network/config/bond-with-vlans/{{role.deprecated_nic_config_name|default(role.name.lower() ~ ".yaml")}}
|
|
{%- endfor %}
|
|
|
|
# FIXME this should really be handled via setting ipv6:true in network_data not overriding here.
|
|
OS::TripleO::Controller::Net::SoftwareConfig: ../network/config/bond-with-vlans/controller-v6.yaml
|