Browse Source

Fix default nic config file names

Use the jinja2 string concatenation operator. The issue affected only
cases where roles in roles_data.yaml didn't have
deprecated_nic_config_name defined.

Closes-Bug: #1752808
Change-Id: I452fe5f387732114d4c4ab8951f03622931ed780
changes/04/549804/2
Jiri Stransky 4 years ago
parent
commit
096b5d973e
  1. 2
      environments/net-bond-with-vlans-no-external.j2.yaml
  2. 2
      environments/net-bond-with-vlans-v6.j2.yaml
  3. 2
      environments/net-bond-with-vlans.j2.yaml
  4. 2
      environments/net-dpdkbond-with-vlans.j2.yaml
  5. 2
      environments/net-multiple-nics-v6.j2.yaml
  6. 2
      environments/net-multiple-nics.j2.yaml
  7. 2
      environments/net-single-nic-linux-bridge-with-vlans.j2.yaml
  8. 2
      environments/net-single-nic-with-vlans-no-external.j2.yaml
  9. 2
      environments/net-single-nic-with-vlans-v6.j2.yaml
  10. 2
      environments/net-single-nic-with-vlans.j2.yaml
  11. 2
      environments/network-environment-v6.j2.yaml
  12. 2
      environments/network-environment.j2.yaml

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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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:

Loading…
Cancel
Save