e9e0eb3d97
This changes the parameter to non-role specific and by default true. The dependant python-tripleoclient patch adds a check to ensure that we only allow usage of old heat nic congigs with 'NetworkConfigWithAnsible: false'. Change-Id: Ie37bdfe64eb1b33afe326161fc6f99601addb7b5
28 lines
1.1 KiB
YAML
28 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
|
|
{%- for role in roles %}
|
|
OS::TripleO::{{role.name}}::Net::SoftwareConfig: OS::Heat::None
|
|
{%- endfor %}
|
|
# Configure other ports as normal
|
|
parameter_defaults:
|
|
{%- for role in roles %}
|
|
{%- if 'controller' not in role.tags %}
|
|
{{role.name}}NetworkConfigTemplate: 'templates/single_nic_vlans/single_nic_vlans.j2'
|
|
# Network configuration assignments for the {{role.name}}
|
|
{%- else %}
|
|
{{role.name}}NetworkConfigTemplate: 'templates/single_nic_vlans/controller_no_external.j2'
|
|
{%- endif %}
|
|
{%- endfor %}
|