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
29 lines
1.3 KiB
YAML
29 lines
1.3 KiB
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.
|
|
#
|
|
# There is no longer a requirement to use net-bond-with-vlans-v6.yaml for
|
|
# nodes when deploying with IPv6. You may now define both an IPv4 network
|
|
# and an IPv6 network as default routes by adding both networks to the
|
|
# default_route_networks list for the Controller role in roles_data.yaml.
|
|
# Then include this environment file to use bond-with-vlans NIC configs.
|
|
|
|
resource_registry:
|
|
{%- for role in roles %}
|
|
OS::TripleO::{{role.name}}::Net::SoftwareConfig: OS::Heat::None
|
|
{%- endfor %}
|
|
parameter_defaults:
|
|
{%- for role in roles %}
|
|
{%- if 'ovsdpdk' in role.tags %}
|
|
{{role.name}}NetworkConfigTemplate: 'templates/bonds_vlans/bonds_vlans_dpdk.j2'
|
|
{%- elif 'storage' in role.tags %}
|
|
{{role.name}}NetworkConfigTemplate: 'templates/bonds_vlans/bonds_vlans_storage.j2'
|
|
{%- else %}
|
|
{{role.name}}NetworkConfigTemplate: 'templates/bonds_vlans/bonds_vlans.j2'
|
|
{%- endif %}
|
|
{%- endfor %}
|