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
20 lines
1.0 KiB
YAML
20 lines
1.0 KiB
YAML
# NOTE: This environment file uses the compute-dpdk
|
|
#
|
|
# 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. The nic4 and nic5 are configured for dpdkbond and a provider
|
|
# network shall be associated with it. 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 if role.name != "Compute" %}
|
|
# 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 won't handle any custom compute roles, instead we should have a generic way to override this
|
|
OS::TripleO::Compute::Net::SoftwareConfig: ../network/config/bond-with-vlans/compute-dpdk.yaml
|