61c5ec9ef9
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
(cherry picked from commit 096b5d973e
)
13 lines
653 B
YAML
13 lines
653 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. This template assumes use of network-isolation.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.yaml.
|
|
resource_registry:
|
|
{%- for role in roles %}
|
|
# 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 %}
|