NFV network config changes

This change is to remove ovs_bridge config for controlplane, intenal_api, storage and tenant configs and update based on linux_bond configs.
openstack-k8s-operators · Jan 29, 2025 · 0872a5a · 0872a5a
1 parent 44608a4
commit 0872a5a
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 21 deletions.
diff --git a/examples/va/nfv/ovs-dpdk-sriov/edpm/nodeset/values.yaml b/examples/va/nfv/ovs-dpdk-sriov/edpm/nodeset/values.yaml
@@ -76,28 +76,30 @@ data:
           {%- endfor %}
           {% set min_viable_mtu = mtu_list | max %}
           network_config:
-          - type: ovs_bridge
-            name: {{ neutron_physical_bridge_name }}
-            mtu: {{ min_viable_mtu }}
+         - type: interface
+            name: nic1
+            mtu: {{ ctlplane_mtu }}
             use_dhcp: false
-            dns_servers: {{ ctlplane_dns_nameservers }}
-            domain: {{ dns_search_domains }}
             addresses:
             - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_cidr }}
             routes: {{ ctlplane_host_routes }}
+          - type: linux_bond
+            name: bond_api
+            mtu: {{ min_viable_mtu }}
+            bonding_options: {{ edpm_bond_interface_ovs_options }}
+            use_dhcp: false
+            dns_servers: {{ ctlplane_dns_nameservers }}
             members:
             - type: interface
               name: nic2
               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'] %}
             - type: vlan
-              mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
               vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
+              device: bond_api
               addresses:
                 - ip_netmask: {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
-              routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
           {% endfor %}
           - type: ovs_user_bridge
             name: br-link1

diff --git a/examples/va/nfv/ovs-dpdk/edpm/nodeset/values.yaml b/examples/va/nfv/ovs-dpdk/edpm/nodeset/values.yaml
@@ -69,28 +69,31 @@ data:
           {%- endfor %}
           {% set min_viable_mtu = mtu_list | max %}
           network_config:
-          - type: ovs_bridge
-            name: {{ neutron_physical_bridge_name }}
-            mtu: {{ min_viable_mtu }}
+          - type: interface
+            name: nic1
+            mtu: {{ ctlplane_mtu }}
             use_dhcp: false
-            dns_servers: {{ ctlplane_dns_nameservers }}
-            domain: {{ dns_search_domains }}
             addresses:
             - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_cidr }}
             routes: {{ ctlplane_host_routes }}
+          - type: linux_bond
+            name: bond_api
+            mtu: {{ min_viable_mtu }}
+            bonding_options: {{ edpm_bond_interface_ovs_options }}
+            use_dhcp: false
+            dns_servers: {{ ctlplane_dns_nameservers }}
             members:
             - type: interface
               name: nic2
               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'] %}
             - type: vlan
-              mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
               vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
+              device: bond_api
               addresses:
               - ip_netmask: {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
-              routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
           {% endfor %}
           - type: ovs_user_bridge
             name: br-link1

diff --git a/examples/va/nfv/sriov/edpm/nodeset/values.yaml b/examples/va/nfv/sriov/edpm/nodeset/values.yaml
@@ -69,19 +69,31 @@ data:
             - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_cidr }}
             routes: {{ ctlplane_host_routes }}
             members:
+          - type: interface
+            name: nic1
+            mtu: {{ ctlplane_mtu }}
+            use_dhcp: false
+            addresses:
+            - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_cidr }}
+            routes: {{ ctlplane_host_routes }}
+          - type: linux_bond
+            name: bond_api
+            mtu: {{ min_viable_mtu }}
+            bonding_options: {{ edpm_bond_interface_ovs_options }}
+            use_dhcp: false
+            dns_servers: {{ ctlplane_dns_nameservers }}
+            members:
             - type: interface
               name: nic2
               mtu: {{ min_viable_mtu }}
-              # force the MAC address of the bridge to this interface
               primary: true
+
           {% for network in nodeset_networks %}
             - type: vlan
-              mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
               vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
+              device: bond_api
               addresses:
-              - ip_netmask:
-                  {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
-              routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
+              - ip_netmask: {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
           {% endfor %}
           - type: sriov_pf
             name: nic3