Update to use control node on storage as VM

inventory/host_vars/compute1.lab.toal.ca/networking.yml

@@ -8,11 +8,18 @@ network_state:
   routes:
     config:
       - destination: 0.0.0.0/0
-        next-hop-interface: ens2f1.6
+        next-hop-interface: enp3s0f0
         next-hop-address: 192.168.90.1
         metric: 400
         table-id: 254
   interfaces:
+    - name: enp3s0f0
+      type: ethernet
+      state: up
+      mtu: 9000
+      ipv4:
+        enabled: true
+        dhcp: true
     - name: ens2f1
       type: ethernet
       state: up
@@ -24,24 +31,6 @@ network_state:
         enabled: false
         dhcp: false
         autoconf: false
-    - name: ens2f1.6
-      type: vlan
-      state: up
-      mtu: 1500
-      ipv4:
-        enabled: true
-        dhcp: false
-        address:
-          - ip: 192.168.90.18
-            prefix-length: 24
-      ipv6:
-        enabled: true
-        dhcp: false
-        autoconf: false
-      vlan:
-        base-iface: ens2f1
-        id: 6
-        protocol: 802.1q
     - name: ens2f1.236
       type: vlan
       state: up
@@ -76,16 +65,11 @@ network_state:
         id: 244
         protocol: 802.1q
     - name: br-mgmt
-      type: ovs-bridge
+      type: linux-bridge
       state: up
-      mtu: 9000
       bridge:
         port:
           - name: ens2f1.236
-          - name: br-mgmt
-    - name: br-mgmt
-      type: ovs-interface
-      state: up
       ipv4:
         enabled: true
         dhcp: false
@@ -96,17 +80,13 @@ network_state:
         enabled: true
         dhcp: false
         autoconf: false
-    - name: br-vxlan
-      type: ovs-bridge
-      state: up
+    - name: br-tunnel
+      type: linux-bridge
       mtu: 9000
+      state: up
       bridge:
         port:
           - name: ens2f1.240
-          - name: br-vxlan
-    - name: br-vxlan
-      type: ovs-interface
-      state: up
       ipv4:
         enabled: true
         dhcp: false
@@ -117,24 +97,13 @@ network_state:
         enabled: true
         dhcp: false
         autoconf: false
-    # - name: br-vlan
-    #   type: ovs-bridge
-    #   state: up
-    #   mtu: 9000
-    #   bridge:
-    #     port:
-    #       - name: ens2f1
     - name: br-storage
-      type: ovs-bridge
+      type: linux-bridge
       state: up
       mtu: 9000
       bridge:
         port:
           - name: ens2f1.244
-          - name: br-storage
-    - name: br-storage
-      type: ovs-interface
-      state: up
       ipv4:
         enabled: true
         dhcp: false