openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix default nic config file names"

This commit is contained in:
Zuul 2018-03-07 16:21:43 +00:00 committed by Gerrit Code Review
parent 3004c31d72 096b5d973e
commit 809c1512d1
12 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
environments/net-bond-with-vlans-no-external.j2.yaml
View File

@ -16,7 +16,7 @@ resource_registry:
{%- for role in roles if role.name != "Controller" %}
# Port 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: ../network/config/bond-with-vlans/{{role.deprecated_nic_config_name|default(role.name.lower() ~ ".yaml")}}
{%- endfor %}
# FIXME this should really be handled via enabled networks in roles_data not overriding here.

2
environments/net-bond-with-vlans-v6.j2.yaml
View File

@ -9,7 +9,7 @@
resource_registry:
{%- for role in roles if role != "Controller" %}
# Port 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: ../network/config/bond-with-vlans/{{role.deprecated_nic_config_name|default(role.name.lower() ~ ".yaml")}}
{%- endfor %}
# FIXME this should really be handled via setting ipv6:true in network_data not overriding here.

2
environments/net-bond-with-vlans.j2.yaml
View File

@ -8,5 +8,5 @@
resource_registry:
{%- for role in roles %}
# Port 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: ../network/config/bond-with-vlans/{{role.deprecated_nic_config_name|default(role.name.lower() ~ ".yaml")}}
{%- endfor %}

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

@ -12,7 +12,7 @@
resource_registry:
{%- for role in roles if role.name != "Compute" %}
# Port 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: ../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

2
environments/net-multiple-nics-v6.j2.yaml
View File

@ -8,7 +8,7 @@
resource_registry:
{%- for role in roles if role.name != "Controller" %}
# Port 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: ../network/config/multiple-nics/{{role.deprecated_nic_config_name|default(role.name.lower() ~ ".yaml")}}
{%- endfor %}
# FIXME this should really be handled via setting ipv6:true in network_data not overriding here.

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

@ -8,5 +8,5 @@
resource_registry:
{%- for role in roles %}
# Port 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: ../network/config/multiple-nics/{{role.deprecated_nic_config_name|default(role.name.lower() ~ ".yaml")}}
{%- endfor %}

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

@ -8,5 +8,5 @@
resource_registry:
{%- for role in roles %}
# Port 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: ../network/config/single-nic-linux-bridge-vlans/{{role.deprecated_nic_config_name|default(role.name.lower() ~ ".yaml")}}
{%- endfor %}

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

@ -16,7 +16,7 @@ resource_registry:
# Configure other ports as normal
{%- for role in roles if role.name != "Controller" %}
# Port 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: ../network/config/single-nic-vlans/{{role.deprecated_nic_config_name|default(role.name.lower() ~ ".yaml")}}
{%- endfor %}
# FIXME this should really be handled via enabled networks in roles_data not overriding here.

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

@ -8,7 +8,7 @@
resource_registry:
{%- for role in roles if role.name != "Controller" %}
# Port 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: ../network/config/single-nic-vlans/{{role.deprecated_nic_config_name|default(role.name.lower() ~ ".yaml")}}
{%- endfor %}
# FIXME this should really be handled via setting ipv6:true in network_data not overriding here.

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

@ -8,5 +8,5 @@
resource_registry:
{%- for role in roles %}
# Port 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: ../network/config/single-nic-vlans/{{role.deprecated_nic_config_name|default(role.name.lower() ~ ".yaml")}}
{%- endfor %}

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

@ -11,7 +11,7 @@ resource_registry:
{%- for role in roles %}
# Port 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)}}
../network/config/single-nic-vlans/{{role.deprecated_nic_config_name|default(role.name.lower() ~ ".yaml")}}
{%- endfor %}
parameter_defaults:

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

@ -7,7 +7,7 @@ resource_registry:
{%- for role in roles %}
# Port 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)}}
../network/config/single-nic-vlans/{{role.deprecated_nic_config_name|default(role.name.lower() ~ ".yaml")}}
{%- endfor %}
parameter_defaults: