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
(cherry picked from commit 096b5d973e
)
This commit is contained in:
parent
a2d529e108
commit
61c5ec9ef9
|
@ -16,7 +16,7 @@ resource_registry:
|
||||||
|
|
||||||
{%- for role in roles if role.name != "Controller" %}
|
{%- for role in roles if role.name != "Controller" %}
|
||||||
# Port assignments for the {{role.name}}
|
# 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 %}
|
{%- endfor %}
|
||||||
|
|
||||||
# FIXME this should really be handled via enabled networks in roles_data not overriding here.
|
# FIXME this should really be handled via enabled networks in roles_data not overriding here.
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
resource_registry:
|
resource_registry:
|
||||||
{%- for role in roles if role != "Controller" %}
|
{%- for role in roles if role != "Controller" %}
|
||||||
# Port assignments for the {{role.name}}
|
# 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 %}
|
{%- endfor %}
|
||||||
|
|
||||||
# FIXME this should really be handled via setting ipv6:true in network_data not overriding here.
|
# FIXME this should really be handled via setting ipv6:true in network_data not overriding here.
|
||||||
|
|
|
@ -8,5 +8,5 @@
|
||||||
resource_registry:
|
resource_registry:
|
||||||
{%- 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: ../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 %}
|
{%- endfor %}
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
resource_registry:
|
resource_registry:
|
||||||
{%- for role in roles if role.name != "Compute" %}
|
{%- for role in roles if role.name != "Compute" %}
|
||||||
# Port assignments for the {{role.name}}
|
# 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 %}
|
{%- endfor %}
|
||||||
|
|
||||||
# FIXME this won't handle any custom compute roles, instead we should have a generic way to override this
|
# FIXME this won't handle any custom compute roles, instead we should have a generic way to override this
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
resource_registry:
|
resource_registry:
|
||||||
{%- for role in roles if role.name != "Controller" %}
|
{%- for role in roles if role.name != "Controller" %}
|
||||||
# Port assignments for the {{role.name}}
|
# 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 %}
|
{%- endfor %}
|
||||||
|
|
||||||
# FIXME this should really be handled via setting ipv6:true in network_data not overriding here.
|
# FIXME this should really be handled via setting ipv6:true in network_data not overriding here.
|
||||||
|
|
|
@ -8,5 +8,5 @@
|
||||||
resource_registry:
|
resource_registry:
|
||||||
{%- 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: ../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 %}
|
{%- endfor %}
|
||||||
|
|
|
@ -8,5 +8,5 @@
|
||||||
resource_registry:
|
resource_registry:
|
||||||
{%- 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: ../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 %}
|
{%- endfor %}
|
||||||
|
|
|
@ -16,7 +16,7 @@ resource_registry:
|
||||||
# Configure other ports as normal
|
# Configure other ports as normal
|
||||||
{%- for role in roles if role.name != "Controller" %}
|
{%- for role in roles if role.name != "Controller" %}
|
||||||
# Port assignments for the {{role.name}}
|
# 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 %}
|
{%- endfor %}
|
||||||
|
|
||||||
# FIXME this should really be handled via enabled networks in roles_data not overriding here.
|
# FIXME this should really be handled via enabled networks in roles_data not overriding here.
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
resource_registry:
|
resource_registry:
|
||||||
{%- for role in roles if role.name != "Controller" %}
|
{%- for role in roles if role.name != "Controller" %}
|
||||||
# Port assignments for the {{role.name}}
|
# 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 %}
|
{%- endfor %}
|
||||||
|
|
||||||
# FIXME this should really be handled via setting ipv6:true in network_data not overriding here.
|
# FIXME this should really be handled via setting ipv6:true in network_data not overriding here.
|
||||||
|
|
|
@ -8,5 +8,5 @@
|
||||||
resource_registry:
|
resource_registry:
|
||||||
{%- 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: ../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 %}
|
{%- endfor %}
|
||||||
|
|
|
@ -11,7 +11,7 @@ resource_registry:
|
||||||
{%- 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:
|
||||||
../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 %}
|
{%- endfor %}
|
||||||
|
|
||||||
parameter_defaults:
|
parameter_defaults:
|
||||||
|
|
|
@ -7,7 +7,7 @@ resource_registry:
|
||||||
{%- 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:
|
||||||
../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 %}
|
{%- endfor %}
|
||||||
|
|
||||||
parameter_defaults:
|
parameter_defaults:
|
||||||
|
|
Loading…
Reference in New Issue