openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Use native ansible for nic configuration"

This commit is contained in:
Zuul 2020-10-16 04:25:35 +00:00 committed by Gerrit Code Review
parent f79cfd078f c9a8988ab7
commit ec0f65b616
4 changed files with 47 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
environments/net-2-linux-bonds-with-vlans.j2.yaml
View File

@ -6,12 +6,17 @@
# reuses the BondInterfaceOvsOptions parameter for both bond
# configurations. You can modify this template to have two
# different parameters for the bonds if options differ.
#
# 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:
{%- for role in roles %}
# Network configuration assignments for the {{role.name}}
OS::TripleO::{{role.name}}::Net::SoftwareConfig: ../network/config/2-linux-bonds-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 'ovsdpdk' in role.tags %}
{{role.name}}NetworkConfigTemplate: 'templates/2_linux_bonds_vlans/2_linux_bonds_vlans_dpdk.j2'
{%- else %}
{{role.name}}NetworkConfigTemplate: 'templates/2_linux_bonds_vlans/2_linux_bonds_vlans.j2'
{%- endif %}
{{role.name}}NetworkConfigWithAnsible: true
{%- endfor %}

14
environments/net-bond-with-vlans.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/bond-with-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 '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 %}
{{role.name}}NetworkConfigWithAnsible: true
{%- endfor %}

20
environments/net-dpdkbond-with-vlans.j2.yaml
View File

@ -9,11 +9,17 @@
# 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:
{%- for role in roles if role.name != "Compute" %}
# Network configuration assignments for the {{role.name}}
OS::TripleO::{{role.name}}::Net::SoftwareConfig: ../network/config/bond-with-vlans/{{role.deprecated_nic_config_name|default(role.name.lower() ~ ".yaml")}}
{%- endfor %}
# FIXME this won't handle any custom compute roles, instead we should have a generic way to override this
OS::TripleO::Compute::Net::SoftwareConfig: ../network/config/bond-with-vlans/compute-dpdk.yaml
resource_registry:
{%- for role in roles %}
OS::TripleO::{{role.name}}::Net::SoftwareConfig: OS::Heat::None
{%- endfor %}
parameter_defaults:
{%- for role in roles %}
{%- if 'compute' not in role.tags %}
{{role.name}}NetworkConfigTemplate: 'templates/bonds_vlans/bonds_vlans.j2'
{%- else %}
{{role.name}}NetworkConfigTemplate: 'templates/bonds_vlans/bonds_vlans_dpdk.j2'
{%- endif %}
{{role.name}}NetworkConfigWithAnsible: true
{%- endfor %}

13
environments/net-single-nic-linux-bridge-with-vlans.j2.yaml
View File

@ -5,8 +5,17 @@
# 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:
{%- for role in roles %}
# Network configuration assignments for the {{role.name}}
OS::TripleO::{{role.name}}::Net::SoftwareConfig: ../network/config/single-nic-linux-bridge-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_linux_bridge_vlans/single_nic_linux_bridge_vlans_storage.j2'
{%- else %}
{{role.name}}NetworkConfigTemplate: 'templates/single_nic_linux_bridge_vlans/single_nic_linux_bridge_vlans.j2'
{%- endif %}
{{role.name}}NetworkConfigWithAnsible: true
{%- endfor %}