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
24 lines
1.1 KiB
YAML
24 lines
1.1 KiB
YAML
# This template configures each role to use Vlans on a single nic for
|
|
# each isolated network.
|
|
# This template assumes use of network-isolation.yaml and should be specified
|
|
# last on the CLI as a Heat environment so as to override specific
|
|
# registry settings in the network-isolation registry.
|
|
#
|
|
# 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:
|
|
|
|
# Set external ports to noop
|
|
OS::TripleO::Network::External: OS::Heat::None
|
|
OS::TripleO::Controller::Ports::ExternalPort: ../network/ports/noop.yaml
|
|
|
|
# Configure other ports as normal
|
|
{%- for role in roles if role.name != "Controller" %}
|
|
# Port assignments for the {{role.name}}
|
|
OS::TripleO::{{role.name}}::Net::SoftwareConfig: ../network/config/single-nic-vlans/{{role.deprecated_nic_config_name|default(role.name.lower() ~ ".yaml")}}
|
|
{%- endfor %}
|
|
|
|
# FIXME this should really be handled via enabled networks in roles_data not overriding here.
|
|
OS::TripleO::Controller::Net::SoftwareConfig: ../network/config/single-nic-vlans/controller-no-external.yaml
|