Merge "Updating seaworthy bonding"

site/seaworthy/networks/physical/networks.yaml

@@ -148,7 +148,7 @@ data:
 schema: 'drydock/NetworkLink/v1'
 metadata:
   schema: 'metadata/Document/v1'
-  name: data
+  name: bond0
   layeringDefinition:
     abstract: false
     layer: site

site/seaworthy/profiles/hardware/dell_r720.yaml

@@ -32,23 +32,23 @@ data:
       # type could identify expected hardware - used for hardware manifest validation
       dev_type: 'I350 Gigabit Network Connection'
       bus_type: 'pci'
-    # enp67s0f0
+    # enp67s0f0 - for data plane traffic
-    data_nic01:
+    dp_nic01:
       address: '0000:43:00.0'
       dev_type: 'Ethernet 10G 2P X520 Adapter'
       bus_type: 'pci'
-    # enp67s0f1
+    # enp67s0f1 - for control plane traffic
-    data_nic02:
+    cp_nic01:
       address: '0000:43:00.1'
       dev_type: 'Ethernet 10G 2P X520 Adapter'
       bus_type: 'pci'
-    # enp68s0f0
+    # enp68s0f0 - for control plane traffic
-    data_nic03:
+    cp_nic02:
       address: '0000:44:00.0'
       dev_type: 'Ethernet 10G 2P X520 Adapter'
       bus_type: 'pci'
-    # enp68s0f1
+    # enp68s0f1 - for data plane traffic
-    data_nic04:
+    dp_nic02:
       address: '0000:44:00.1'
       dev_type: 'Ethernet 10G 2P X520 Adapter'
       bus_type: 'pci'

site/seaworthy/profiles/host/cp_r720.yaml

@@ -32,12 +32,10 @@ data:
       networks:
         - pxe
     bond0:
-      device_link: data
+      device_link: bond0
       slaves:
-        - data_nic01
+        - cp_nic01
-        - data_nic02
+        - cp_nic02
-        - data_nic03
-        - data_nic04
       networks:
         - oam
         - storage
@@ -117,12 +115,10 @@ data:
       networks:
         - pxe
     bond0:
-      device_link: data
+      device_link: bond0
       slaves:
-        - data_nic01
+        - cp_nic01
-        - data_nic02
+        - cp_nic02
-        - data_nic03
-        - data_nic04
       networks:
         - oam
         - storage

site/seaworthy/profiles/host/dp_r720.yaml

@@ -31,12 +31,10 @@ data:
       networks:
         - pxe
     bond0:
-      device_link: data
+      device_link: bond0
       slaves:
-        - data_nic01
+        - cp_nic01
-        - data_nic02
+        - cp_nic02
-        - data_nic03
-        - data_nic04
       networks:
         - oam
         - storage