Merge pull request #150 from openstack-k8s-operators/revert-146-rever…

…t-142-nodeset_networks Revert "Revert "Use nodeset_networks""
openstack-k8s-operators · Apr 2, 2024 · df8abc7 · df8abc7
2 parents 554f039 + 7265eb2
commit df8abc7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git 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 role_networks %}
+          {% for network in nodeset_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 role_networks %}
+          {% for network in nodeset_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
@@ -68,7 +68,7 @@ data:
         edpm_network_config_template: |
           ---
           {% set mtu_list = [ctlplane_mtu] %}
-          {% for network in role_networks %}
+          {% for network in nodeset_networks %}
           {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }}
           {%- endfor %}
           {% set min_viable_mtu = mtu_list | max %}
@@ -88,7 +88,7 @@ data:
               mtu: {{ min_viable_mtu }}
               # force the MAC address of the bridge to this interface
               primary: true
-          {% for network in role_networks if network not in ['External', 'Tenant'] %}
+          {% for network in nodeset_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
@@ -64,7 +64,7 @@ data:
         edpm_network_config_template: |
           ---
           {% set mtu_list = [ctlplane_mtu] %}
-          {% for network in role_networks %}
+          {% for network in nodeset_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 role_networks if network not in ['External', 'Tenant'] %}
+          {% for network in nodeset_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
@@ -55,7 +55,7 @@ data:
         edpm_network_config_template: |
           ---
           {% set mtu_list = [ctlplane_mtu] %}
-          {% for network in role_networks %}
+          {% for network in nodeset_networks %}
           {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }}
           {%- endfor %}
           {% set min_viable_mtu = mtu_list | max %}
@@ -75,7 +75,7 @@ data:
               mtu: {{ min_viable_mtu }}
               # force the MAC address of the bridge to this interface
               primary: true
-          {% for network in role_networks %}
+          {% for network in nodeset_networks %}
             - type: vlan
               mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
               vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}