openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Use native ansible for nic configuration in some envs"

This commit is contained in:
Zuul 2020-10-16 04:25:32 +00:00 committed by Gerrit Code Review
parent 05231ddd98 6de80864af
commit f79cfd078f
4 changed files with 47 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
environments/net-multiple-nics-vlans.j2.yaml
View File

@ -8,6 +8,16 @@
#
resource_registry:
{%- for role in roles %}
# Network configuration assignments for the {{role.name}}
OS::TripleO::{{role.name}}::Net::SoftwareConfig: ../network/config/multiple-nics-vlans/{{role.deprecated_nic_config_name|default(role.name.lower() ~ ".yaml")}}
OS::TripleO::{{role.name}}::Net::SoftwareConfig: OS::Heat::None
{%- endfor %}
parameter_defaults:
{%- for role in roles %}
{%- if 'external_bridge' in role.tags %}
{{role.name}}NetworkConfigTemplate: 'templates/multiple_nics_vlans/multiple_nics_valns_dvr.j2'
{%- elif 'ovsdpdk' in role.tags %}
{{role.name}}NetworkConfigTemplate: 'templates/multiple_nics_vlans/multiple_nics_vlans_dpdk.j2'
{%- else %}
{{role.name}}NetworkConfigTemplate: 'templates/multiple_nics_vlans/multiple_nics_vlans.j2'
{%- endif %}
{{role.name}}NetworkConfigWithAnsible: true
{%- endfor %}

14
environments/net-multiple-nics.j2.yaml
View File

@ -14,6 +14,16 @@
resource_registry:
{%- for role in roles %}
# Network configuration assignments for the {{role.name}}
OS::TripleO::{{role.name}}::Net::SoftwareConfig: ../network/config/multiple-nics/{{role.deprecated_nic_config_name|default(role.name.lower() ~ ".yaml")}}
OS::TripleO::{{role.name}}::Net::SoftwareConfig: OS::Heat::None
{%- endfor %}
parameter_defaults:
{%- for role in roles %}
{%- if 'external_bridge' in role.tags %}
{{role.name}}NetworkConfigTemplate: 'templates/multiple_nics/multiple_nics_dvr.j2'
{%- elif 'ovsdpdk' in role.tags %}
{{role.name}}NetworkConfigTemplate: 'templates/multiple_nics/multiple_nics_dpdk.j2'
{%- else %}
{{role.name}}NetworkConfigTemplate: 'templates/multiple_nics/multiple_nics.j2'
{%- endif %}
{{role.name}}NetworkConfigWithAnsible: true
{%- endfor %}

21
environments/net-single-nic-with-vlans-no-external.j2.yaml
View File

@ -12,12 +12,17 @@ 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" %}
# Network configuration 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")}}
{%- 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 %}
{{role.name}}NetworkConfigWithAnsible: true
{%- 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

12
environments/net-single-nic-with-vlans.j2.yaml
View File

@ -14,6 +14,14 @@
resource_registry:
{%- for role in roles %}
# Network configuration 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")}}
OS::TripleO::{{role.name}}::Net::SoftwareConfig: OS::Heat::None
{%- endfor %}
parameter_defaults:
{%- 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 %}
{{role.name}}NetworkConfigWithAnsible: true
{%- endfor %}