From dc69e34864f58ec5725e0eb8d8d93e94b01ced1b Mon Sep 17 00:00:00 2001 From: Andrew Bays Date: Tue, 26 Mar 2024 17:22:35 -0400 Subject: [PATCH] Revert "Use nodeset_networks" --- examples/va/hci/edpm-pre-ceph/values.yaml | 4 ++-- examples/va/nfv/ovs-dpdk-sriov/edpm/values.yaml | 4 ++-- examples/va/nfv/ovs-dpdk/edpm/values.yaml | 4 ++-- examples/va/nfv/sriov/edpm/values.yaml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/va/hci/edpm-pre-ceph/values.yaml b/examples/va/hci/edpm-pre-ceph/values.yaml index 30ca0c002..b2cb08e67 100644 --- a/examples/va/hci/edpm-pre-ceph/values.yaml +++ b/examples/va/hci/edpm-pre-ceph/values.yaml @@ -37,7 +37,7 @@ data: edpm_network_config_template: | --- {% set mtu_list = [ctlplane_mtu] %} - {% for network in nodeset_networks %} + {% for network in role_networks %} {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }} {%- endfor %} {% set min_viable_mtu = mtu_list | max %} @@ -57,7 +57,7 @@ data: mtu: {{ min_viable_mtu }} # force the MAC address of the bridge to this interface primary: true - {% for network in nodeset_networks %} + {% for network in role_networks %} - type: vlan mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }} vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }} diff --git a/examples/va/nfv/ovs-dpdk-sriov/edpm/values.yaml b/examples/va/nfv/ovs-dpdk-sriov/edpm/values.yaml index b7949bb23..b54c0ac73 100644 --- a/examples/va/nfv/ovs-dpdk-sriov/edpm/values.yaml +++ b/examples/va/nfv/ovs-dpdk-sriov/edpm/values.yaml @@ -64,7 +64,7 @@ data: edpm_network_config_template: | --- {% set mtu_list = [ctlplane_mtu] %} - {% for network in nodeset_networks %} + {% for network in role_networks %} {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }} {%- endfor %} {% set min_viable_mtu = mtu_list | max %} @@ -84,7 +84,7 @@ data: mtu: {{ min_viable_mtu }} # force the MAC address of the bridge to this interface primary: true - {% for network in nodeset_networks if network not in ['External', 'Tenant'] %} + {% for network in role_networks if network not in ['External', 'Tenant'] %} - type: vlan mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }} vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }} diff --git a/examples/va/nfv/ovs-dpdk/edpm/values.yaml b/examples/va/nfv/ovs-dpdk/edpm/values.yaml index 98c0a1f97..a22ccc6cc 100644 --- a/examples/va/nfv/ovs-dpdk/edpm/values.yaml +++ b/examples/va/nfv/ovs-dpdk/edpm/values.yaml @@ -60,7 +60,7 @@ data: edpm_network_config_template: | --- {% set mtu_list = [ctlplane_mtu] %} - {% for network in nodeset_networks %} + {% for network in role_networks %} {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }} {%- endfor %} {% set min_viable_mtu = mtu_list | max %} @@ -80,7 +80,7 @@ data: mtu: {{ min_viable_mtu }} # force the MAC address of the bridge to this interface primary: true - {% for network in nodeset_networks if network not in ['External', 'Tenant'] %} + {% for network in role_networks if network not in ['External', 'Tenant'] %} - type: vlan mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }} vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }} diff --git a/examples/va/nfv/sriov/edpm/values.yaml b/examples/va/nfv/sriov/edpm/values.yaml index c863647f2..645f22d5b 100644 --- a/examples/va/nfv/sriov/edpm/values.yaml +++ b/examples/va/nfv/sriov/edpm/values.yaml @@ -51,7 +51,7 @@ data: edpm_network_config_template: | --- {% set mtu_list = [ctlplane_mtu] %} - {% for network in nodeset_networks %} + {% for network in role_networks %} {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }} {%- endfor %} {% set min_viable_mtu = mtu_list | max %} @@ -71,7 +71,7 @@ data: mtu: {{ min_viable_mtu }} # force the MAC address of the bridge to this interface primary: true - {% for network in nodeset_networks %} + {% for network in role_networks %} - type: vlan mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }} vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}