Upgrade intel pod 15 to Airship 1.8

Depends: https://gerrit.opnfv.org/gerrit/c/airship/+/70158
Change-Id: Ic9b8a56de430d02f2f21e053a40c9c29ab40433f
Signed-off-by: James Gu <james.gu@att.com>

1 files changed, 13 insertions, 31 deletions

diff --git a/site/intel-pod15/profiles/hardware/intel-pod15.yaml b/site/intel-pod15/profiles/hardware/intel-s2600wt.yaml
index 207ee94..2dcc43b 100644
--- a/site/intel-pod15/profiles/hardware/intel-pod15.yaml
+++ b/site/intel-pod15/profiles/hardware/intel-s2600wt.yaml
@@ -2,30 +2,18 @@
 schema: 'drydock/HardwareProfile/v1'
 metadata:
   schema: 'metadata/Document/v1'
-  name: intel-pod15
+  replacement: true
+  name: intel-s2600wt
   layeringDefinition:
     abstract: false
     layer: site
+    parentSelector:
+      name: intel-s2600wt
+    actions:
+      - method: replace
+        path: .device_aliases
   storagePolicy: cleartext
 data:
-  # Vendor of the server chassis
-  vendor: Intel
-  # Generation of the chassis model
-  generation: '4'
-  # Version of the chassis model within its generation - not version of the hardware definition
-  hw_version: '3'
-  # The certified version of the chassis BIOS
-  bios_version: 'SE5C610.86B.01.01.0019.101220160604'
-  # Mode of the default boot of hardware - bios, uefi
-  boot_mode: bios
-  # Protocol of boot of the hardware - pxe, usb, hdd
-  bootstrap_protocol: pxe
-  # Which interface to use for network booting within the OOB manager, not OS device
-  pxe_interface: 0
-
-  # Map hardware addresses to aliases/roles to allow a mix of hardware configs
-  # in a site to result in a consistent configuration
-
   device_aliases:
     ## network
     # $ sudo lspci |grep -i ethernet
@@ -46,14 +34,14 @@ data:
       bus_type: 'pci'
 
     # data networks
-    # ens785f1
+    # ens785f0
     data_nic1:
-      address: '0000:05:00.1'
+      address: '0000:05:00.0'
       dev_type: '82599ES 10-Gigabit SFI/SFP+ Network Connection'
       bus_type: 'pci'
-    # ens785f0
+    # ens785f1
     data_nic2:
-      address: '0000:05:00.0'
+      address: '0000:05:00.1'
       dev_type: '82599ES 10-Gigabit SFI/SFP+ Network Connection'
       bus_type: 'pci'
 
@@ -78,17 +66,11 @@ data:
     # /dev/sda
     bootdisk:
       address: '0:0.0.0'
-      dev_type: 'SSDSC2BB48'
+      dev_type: 'INTEL SSDSC2BB48'
       bus_type: 'scsi'
     # /dev/sdb
     datadisk:
       address: '1:0.0.0'
-      dev_type: 'MG03ACA1'
+      dev_type: 'TOSHIBA MG03ACA1'
       bus_type: 'scsi'
-  cpu_sets:
-    kvm: '4-43,48-87'
-  hugepages:
-    dpdk:
-      size: '1G'
-      count: 32
 ...