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>

2 files changed, 28 insertions, 112 deletions

diff --git a/site/intel-pod15/baremetal/bootactions/ixgbe-dkms-install.yaml b/site/intel-pod15/baremetal/bootactions/ixgbe-dkms-install.yaml
deleted file mode 100644
index 49b5329..0000000
--- a/site/intel-pod15/baremetal/bootactions/ixgbe-dkms-install.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
----
-# This file defines a boot action to install specified version of the ixgbe
-# driver and blacklist the ixgbevf driver.
-schema: 'drydock/BootAction/v1'
-metadata:
-  schema: 'metadata/Document/v1'
-  name: ixgbe-dkms-install
-  storagePolicy: 'cleartext'
-  layeringDefinition:
-    abstract: false
-    layer: site
-  labels:
-    application: 'drydock'
-  substitutions:
-    - src:
-        schema: pegleg/Script/v1
-        name: ixgbe-dkms-install
-        path: .
-      dest:
-        path: .assets[1].data
-data:
-  signaling: false
-  assets:
-    - path: /etc/systemd/system/ixgbe-dkms-install.service
-      type: unit
-      permissions: '444'
-      data: |
-        [Unit]
-        Description=Service for Installing ixgbe driver
-        DefaultDependencies=no
-        Before=promjoin.service
-        After=network-online.target local-fs.target cloud-init.target
-
-        [Service]
-        Type=oneshot
-        ExecStart=/opt/ixgbe-dkms-install.sh
-        RemainAfterExit=true
-
-        [Install]
-        WantedBy=airship.target
-
-      data_pipeline:
-        - utf8_decode
-    - path: /opt/ixgbe-dkms-install.sh
-      type: file
-      permissions: '700'
-      data_pipeline:
-        - utf8_decode
-    - path: /etc/modprobe.d/sriov_blacklist.conf
-      type: file
-      permissions: '644'
-      data_pipeline:
-        - utf8_decode
-      data: |
-        blacklist ixgbevf
-...
diff --git a/site/intel-pod15/baremetal/nodes.yaml b/site/intel-pod15/baremetal/nodes.yaml
index 75acde9..0e20234 100644
--- a/site/intel-pod15/baremetal/nodes.yaml
+++ b/site/intel-pod15/baremetal/nodes.yaml
@@ -31,6 +31,8 @@ metadata:
     layer: site
   storagePolicy: cleartext
 data:
+  oob:
+    account: 'root'
   # NEWSITE-CHANGEME: The IPv4 address assigned to each logical network on this
   # node. In the reference Airship deployment, this is all logical Networks defined
   # in networks/physical/networks.yaml. IP addresses are manually assigned, by-hand.
@@ -46,26 +48,26 @@ data:
     # the environment; these are not addresses which MaaS assigns.
     - network: oob
       address: 10.10.150.12
-    # The IP of the node on the DMZ network. Refer to the static IP range
-    # defined for the Admin network in networks/physical/networks.yaml.
-    - network: dmz
+    # The IP of the node on the oam network. Refer to the static IP range
+    # defined for the oam network in networks/physical/networks.yaml.
+    - network: oam
       address: 10.10.150.22
-    # The IP of the node on the Admin network. Refer to the static IP range
+    # The IP of the node on the pxe network. Refer to the static IP range
     # defined for the Admin network in networks/physical/networks.yaml.
     # This network is used for PXE bootstrapping of the bare-metal servers.
-    - network: admin
+    - network: pxe
       address: 10.10.151.22
-    # The IP of the node on the Private network. Refer to the static IP range
-    # defined for the Private network in networks/physical/networks.yaml.
-    - network: private
+    # The IP of the node on the calico network. Refer to the static IP range
+    # defined for the calico network in networks/physical/networks.yaml.
+    - network: calico
       address: 10.10.152.22
     # The IP of the node on the Storage network. Refer to the static IP range
     # defined for the Storage network in networks/physical/networks.yaml.
     - network: storage
       address: 10.10.153.22
-    # The IP of the node on the Management network. Refer to the static IP range
-    # defined for the Management network in networks/physical/networks.yaml.
-    - network: management
+    # The IP of the node on the overlay network. Refer to the static IP range
+    # defined for the overlay network in networks/physical/networks.yaml.
+    - network: overlay
       address: 10.10.154.22
   # NEWSITE-CHANGEME: Set the host profile for the node.
   # Note that there are different host profiles depending if this is a control
@@ -77,7 +79,7 @@ data:
   # a general set of host profiles at the "type" or "global" layers/folders.
   # If you have hardware that is not on this list of profiles, you may need to
   # create a new host profile for that hardware.
-  host_profile: cp-intel-pod15
+  host_profile: cp-intel-s2600wt
   metadata:
     tags:
       # NEWSITE-CHANGEME: See previous comment. Apply 'masters' tag for control
@@ -100,22 +102,24 @@ metadata:
     layer: site
   storagePolicy: cleartext
 data:
+  oob:
+    account: 'root'
   # NEWSITE-CHANGEME: The next node's IPv4 addressing
   addressing:
     - network: oob
       address: 10.10.150.13
-    - network: dmz
+    - network: oam
       address: 10.10.150.23
-    - network: admin
+    - network: pxe
       address: 10.10.151.23
-    - network: private
+    - network: calico
       address: 10.10.152.23
     - network: storage
       address: 10.10.153.23
-    - network: management
+    - network: overlay
       address: 10.10.154.23
   # NEWSITE-CHANGEME: The next node's host profile
-  host_profile: cp-intel-pod15
+  host_profile: cp-intel-s2600wt
   metadata:
     # NEWSITE-CHANGEME: The next node's rack designation
     rack: pod15-rack
@@ -134,56 +138,24 @@ metadata:
     layer: site
   storagePolicy: cleartext
 data:
+  oob:
+    account: 'root'
   # NEWSITE-CHANGEME: The next node's IPv4 addressing
   addressing:
     - network: oob
       address: 10.10.150.14
-    - network: dmz
+    - network: oam
       address: 10.10.150.24
-    - network: admin
+    - network: pxe
       address: 10.10.151.24
-    - network: private
+    - network: calico
       address: 10.10.152.24
     - network: storage
       address: 10.10.153.24
-    - network: management
+    - network: overlay
       address: 10.10.154.24
   # NEWSITE-CHANGEME: The next node's host profile
-  host_profile: dp-intel-pod15
-  metadata:
-    # NEWSITE-CHANGEME: The next node's rack designation
-    rack: pod15-rack
-    # NEWSITE-CHANGEME: The next node's role desigatnion
-    tags:
-      - 'workers'
-...
----
-schema: 'drydock/BaremetalNode/v1'
-metadata:
-  schema: 'metadata/Document/v1'
-  # NEWSITE-CHANGEME: The next node's hostname
-  name: pod15-node5
-  layeringDefinition:
-    abstract: false
-    layer: site
-  storagePolicy: cleartext
-data:
-  # NEWSITE-CHANGEME: The next node's IPv4 addressing
-  addressing:
-    - network: oob
-      address: 10.10.150.15
-    - network: dmz
-      address: 10.10.150.25
-    - network: admin
-      address: 10.10.151.25
-    - network: private
-      address: 10.10.152.25
-    - network: storage
-      address: 10.10.153.25
-    - network: management
-      address: 10.10.154.25
-  # NEWSITE-CHANGEME: The next node's host profile
-  host_profile: dp-intel-pod15
+  host_profile: dp-intel-s2600wt
   metadata:
     # NEWSITE-CHANGEME: The next node's rack designation
     rack: pod15-rack