openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Update some more environments to use new ansible nic config"

Browse Source
This commit is contained in:
Zuul 2020-10-29 12:49:49 +00:00 committed by Gerrit Code Review
commit ea645e0c37
3 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
environments/network-environment-v6-all.j2.yaml
View File

@ -7,14 +7,20 @@ resource_registry:
# such as net-bond-with-vlans-v6.yaml, or modifying the list here. # such as net-bond-with-vlans-v6.yaml, or modifying the list here.
{%- for role in roles %} {%- for role in roles %}
# Port assignments for the {{role.name}} # Port assignments for the {{role.name}}
OS::TripleO::{{role.name}}::Net::SoftwareConfig: OS::TripleO::{{role.name}}::Net::SoftwareConfig: OS::Heat::None
../network/config/single-nic-vlans/{{role.deprecated_nic_config_name|default(role.name.lower() ~ ".yaml")}}
{%- endfor %} {%- endfor %}
parameter_defaults: parameter_defaults:
# This section is where deployment-specific configuration is done # This section is where deployment-specific configuration is done
# #
# {%- for role in roles %}
{%- if 'storage' in role.tags %}
{{role.name}}NetworkConfigTemplate: 'templates/single_nic_vlans/single_nic_vlans_storage.j2'
{%- else %}
{{role.name}}NetworkConfigTemplate: 'templates/single_nic_vlans/single_nic_vlans.j2'
{%- endif %}
{%- endfor %}
{% for network in networks if network.enabled|default(true) %} {% for network in networks if network.enabled|default(true) %}
# Customize the IP subnets to match the local environment # Customize the IP subnets to match the local environment
{{network.name}}NetCidr: '{{network.ipv6_subnet}}' {{network.name}}NetCidr: '{{network.ipv6_subnet}}'

11
environments/network-environment-v6.j2.yaml
View File

@ -10,13 +10,20 @@ resource_registry:
# such as net-bond-with-vlans-v6.yaml, or modifying the list here. # such as net-bond-with-vlans-v6.yaml, or modifying the list here.
{%- for role in roles %} {%- for role in roles %}
# Port assignments for the {{role.name}} # Port assignments for the {{role.name}}
OS::TripleO::{{role.name}}::Net::SoftwareConfig: OS::TripleO::{{role.name}}::Net::SoftwareConfig: OS::Heat::None
../network/config/single-nic-vlans/{{role.deprecated_nic_config_name|default(role.name.lower() ~ ".yaml")}}
{%- endfor %} {%- endfor %}
parameter_defaults: parameter_defaults:
# This section is where deployment-specific configuration is done # This section is where deployment-specific configuration is done
# #
{%- for role in roles %}
{%- if 'storage' in role.tags %}
{{role.name}}NetworkConfigTemplate: 'templates/single_nic_vlans/single_nic_vlans_storage.j2'
{%- else %}
{{role.name}}NetworkConfigTemplate: 'templates/single_nic_vlans/single_nic_vlans.j2'
{%- endif %}
{%- endfor %}
{% for network in networks if network.enabled|default(true) %} {% for network in networks if network.enabled|default(true) %}
{%- if network.name != 'Tenant' %} {%- if network.name != 'Tenant' %}
# Customize the IP subnets to match the local environment # Customize the IP subnets to match the local environment

11
environments/network-environment.j2.yaml
View File

@ -6,13 +6,20 @@ resource_registry:
# such as net-bond-with-vlans.yaml, or modifying the list here. # such as net-bond-with-vlans.yaml, or modifying the list here.
{%- for role in roles %} {%- for role in roles %}
# Port assignments for the {{role.name}} # Port assignments for the {{role.name}}
OS::TripleO::{{role.name}}::Net::SoftwareConfig: OS::TripleO::{{role.name}}::Net::SoftwareConfig: OS::Heat::None
../network/config/single-nic-vlans/{{role.deprecated_nic_config_name|default(role.name.lower() ~ ".yaml")}}
{%- endfor %} {%- endfor %}
parameter_defaults: parameter_defaults:
# This section is where deployment-specific configuration is done # This section is where deployment-specific configuration is done
# #
{%- for role in roles %}
{%- if 'storage' in role.tags %}
{{role.name}}NetworkConfigTemplate: 'templates/single_nic_vlans/single_nic_vlans_storage.j2'
{%- else %}
{{role.name}}NetworkConfigTemplate: 'templates/single_nic_vlans/single_nic_vlans.j2'
{%- endif %}
{%- endfor %}
{% for network in networks if network.enabled|default(true) %} {% for network in networks if network.enabled|default(true) %}
# Customize the IP subnet to match the local environment # Customize the IP subnet to match the local environment
{%- if network.ipv6|default(false) %} {%- if network.ipv6|default(false) %}