diff --git a/network/config/multiple-nics/role.role.j2.yaml b/network/config/multiple-nics/role.role.j2.yaml index b0d2953eef..0f765e518f 100644 --- a/network/config/multiple-nics/role.role.j2.yaml +++ b/network/config/multiple-nics/role.role.j2.yaml @@ -84,7 +84,7 @@ resources: get_param: ControlPlaneDefaultRoute {%- endif %} {%- set nics_used = [1] %} -{%- for network in networks %} +{%- for network in networks if network.name not in role.networks_skip_config|default([]) %} {%- if network.name not in ["External", "Tenant"] %} {%- if network.name in role.networks %} - type: interface @@ -149,4 +149,4 @@ outputs: OS::stack_id: description: The OsNetConfigImpl resource. value: - get_resource: OsNetConfigImpl \ No newline at end of file + get_resource: OsNetConfigImpl diff --git a/network/config/single-nic-linux-bridge-vlans/role.role.j2.yaml b/network/config/single-nic-linux-bridge-vlans/role.role.j2.yaml index a67a3cfda1..87d82c789f 100644 --- a/network/config/single-nic-linux-bridge-vlans/role.role.j2.yaml +++ b/network/config/single-nic-linux-bridge-vlans/role.role.j2.yaml @@ -81,7 +81,8 @@ resources: - type: interface name: interface_name primary: true -{%- for network in networks if network.enabled|default(true) and network.name in role.networks %} +{%- for network in networks if network.enabled|default(true) and network.name in role.networks + and network.name not in role.networks_skip_config|default([]) %} - type: vlan vlan_id: get_param: {{network.name}}NetworkVlanID diff --git a/roles/ComputeLiquidio.yaml b/roles/ComputeLiquidio.yaml index 1b641f64d7..52b02922fa 100644 --- a/roles/ComputeLiquidio.yaml +++ b/roles/ComputeLiquidio.yaml @@ -9,6 +9,8 @@ - InternalApi - Tenant - Storage + networks_skip_config: + - Tenant HostnameFormatDefault: '%stackname%-lionovacompute-%index%' ServicesDefault: - OS::TripleO::Services::Aide diff --git a/roles/README.rst b/roles/README.rst index d82ca52c01..dbf40a72a7 100644 --- a/roles/README.rst +++ b/roles/README.rst @@ -72,6 +72,10 @@ Role Options access to when network isolation is enabled. The names should match those defined in network_data.yaml. + * networks_skip_config: (list), optional list of networks for which the + configuration would be skipped for the role. The names should match + those defined in network_data.yaml + Working with Roles ================== The tripleoclient provides a series of commands that can be used to view