PDF and IDF for Ericsson pod 2 to be used in CI

Pod 2 is meant to be used for verification deployment jobs. This
patch adds the PDF and IDF config files for this pod.

Signed-off-by: Georg Kunz <georg.kunz@est.tech>
Change-Id: I33231547921e82cf77c7051e6ba0319ffb66a09a
Reviewed-on: https://gerrit.opnfv.org/gerrit/c/kuberef/+/70826
Reviewed-by: Victor Morales <chipahuac@hotmail.com>
Tested-by: Rihab Banday <rihab.banday@ericsson.com>

5 files changed, 202 insertions, 8 deletions

diff --git a/hw_config/ericsson-pod1/idf.yaml b/hw_config/ericsson-pod1/idf.yaml
index 466a340..4f04bdb 100644
--- a/hw_config/ericsson-pod1/idf.yaml
+++ b/hw_config/ericsson-pod1/idf.yaml
@@ -7,7 +7,7 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 ---
-### ERICSSON POD 2 installer descriptor file ###
+### ERICSSON POD 1 installer descriptor file ###
 idf:
   version: 0.1
   net_config: &net_config
diff --git a/hw_config/ericsson-pod1/pdf.yaml b/hw_config/ericsson-pod1/pdf.yaml
index 7896877..48933f1 100644
--- a/hw_config/ericsson-pod1/pdf.yaml
+++ b/hw_config/ericsson-pod1/pdf.yaml
@@ -84,17 +84,14 @@ nodes:
         speed: 10gb
         features: 'dpdk|sriov'
         mac_address: "38:ea:a7:8f:1f:d4"
-#        address: 192.168.11.19
       - name: 'nic4'
         speed: 10gb
         features: 'dpdk|sriov'
         mac_address: "38:ea:a7:8f:1f:d5"
-#        address: 100.64.200.9
       - name: 'nic5'
         speed: 10gb
         features: 'dpdk|sriov'
         mac_address: "38:ea:a7:8f:52:cd"
-#        address: 100.64.200.9
       - name: 'nic6'
         speed: 10gb
         features: 'dpdk|sriov'
@@ -126,20 +123,16 @@ nodes:
         speed: 10gb
         features: 'dpdk|sriov'
         mac_address: "38:ea:a7:8f:07:50"
-#        address: 192.168.11.20
       - name: 'nic4'
         speed: 10gb
         features: 'dpdk|sriov'
-#        address: 10.10.10.12
         mac_address: "38:ea:a7:8f:07:51"
       - name: 'nic5'
         speed: 10gb
         features: 'dpdk|sriov'
-#        address: 100.64.200.10
         mac_address: "38:ea:a7:8f:12:49"
       - name: 'nic6'
         speed: 10gb
         features: 'dpdk|sriov'
         mac_address: "00:00:00:00:00:00"
-#        address: 10.10.10.14
         vlan: native
diff --git a/hw_config/ericsson-pod2/idf.yaml b/hw_config/ericsson-pod2/idf.yaml
new file mode 100644
index 0000000..0e389b3
--- /dev/null
+++ b/hw_config/ericsson-pod2/idf.yaml
@@ -0,0 +1,66 @@
+# SPDX-license-identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2020 Ericsson AB and others
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+### ERICSSON POD 2 installer descriptor file ###
+idf:
+  version: 0.1
+  net_config: &net_config
+    oob:
+      interface: 0
+      vlan: native
+      network: 10.0.20.0
+      gateway: 10.0.20.1
+      mask: 24
+      dns:
+        - 192.168.1.200
+        - 8.8.8.8
+    public:
+      interface: 1
+      vlan: 80
+      network: 100.64.201.6
+      gateway: 100.64.201.1
+      mask: 24
+      dns:
+        - 192.168.1.200
+        - 8.8.8.8
+  kubespray: &idf_kubespray
+    nodes_roles:
+      node1: [k8s-cluster, kube-node, kube-master, etcd, vault]
+      node2: [k8s-cluster, kube-node]
+    groups:
+      k8s-cluster:
+        - kube-node
+        - kube-master
+    hostnames:
+      node1: master0
+      node2: node0
+    network:
+      # network mapping
+      network_mapping:
+        net_admin: oob
+        # Public network
+        net_public: public
+        # Management network used by installer components to communicate
+        net_mgmt: public
+
+engine:
+  pod_name: ericsson-pod1
+  net_config: *net_config
+
+  # net_config network to be used by the PXE
+  pxe_network: oob
+
+  # net_config network to be used for the internet access
+  public_network: public
+
+  # interface to be used by the PXE
+  pxe_interface: ens4
+
+  installers:
+    kubespray: *idf_kubespray
diff --git a/hw_config/ericsson-pod2/pdf.yaml b/hw_config/ericsson-pod2/pdf.yaml
new file mode 100644
index 0000000..6f4bab4
--- /dev/null
+++ b/hw_config/ericsson-pod2/pdf.yaml
@@ -0,0 +1,127 @@
+---
+# SPDX-license-identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2020 Ericsson AB and others
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+version: 1.0
+details:
+  pod_owner: Ericsson
+  contact: georg.kunz@ericsson.com
+  lab: Ericsson OPNFV CI pod 2
+  location: Sweden
+  type: baremetal
+  link: https://wiki.opnfv.org/display/pharos/Ericsson+Hosting
+##############################################################################
+jumphost:
+  name: kuberef-jump
+  node:
+    type: virtual
+    vendor: vmware
+    model: pc
+    arch: x86_64
+    cpus: 4
+    cpu_cflags: host-passthrough
+    cores: 4
+    memory: 9G
+  disks:
+    - name: disk1
+      disk_capacity: 1200G
+      disk_type: hdd
+      disk_interface: sata
+      disk_rotation:
+  os: ubuntu1804
+  interfaces:
+    - name: 'ens4'
+      address: 10.0.20.1
+      mac_address: 52:54:00:4a:e8:2d
+    - name: 'ens3'
+      address: 100.64.201.254
+##############################################################################
+nodes:
+  - name: node1
+    node: &nodeparams
+      type: baremetal
+      vendor: HP
+      model: ProLiant BL460c Gen9
+      arch: x86_64
+      cpus: 2
+      cpu_cflags: ivybridge
+      cores: 12
+      memory: 128G
+    disks: &disks
+      - name: disk1
+        disk_capacity: 1117G
+        disk_type: hdd
+        disk_interface: scsi
+        disk_rotation: 15000
+    remote_params: &remoteparas
+      type:
+        - ipmi
+      user: opnfv
+      pass: Winter2017
+    remote_management:
+      <<: *remoteparas
+      address: 172.16.2.12
+      mac_address: "58:20:B1:01:8B:F0"
+    interfaces:
+      - name: 'nic1'
+        speed: 1gb
+        features: 'dpdk|sriov'
+        mac_address: "5c:b9:01:8b:a6:95"
+        vlan: native
+        address: 10.0.20.11
+      - name: 'nic2'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        mac_address: "5c:b9:01:8b:a6:80"
+        address: 100.64.201.11
+        vlan: native
+      - name: 'nic3'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        mac_address: "5c:b9:01:8b:a6:94"
+      - name: 'nic4'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        mac_address: "ec:b1:d7:a2:44:a0"
+      - name: 'nic5'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        mac_address: "5c:b9:01:8b:a6:81"
+  ############################################################################
+  - name: node2
+    node: *nodeparams
+    disks: *disks
+    remote_management:
+      <<: *remoteparas
+      address: 172.16.2.13
+      mac_address: "58:20:B1:01:8E:FC"
+    interfaces:
+      - name: 'nic1'
+        speed: 1gb
+        features: 'dpdk|sriov'
+        address: 10.0.20.12
+        mac_address: "5c:b9:01:8b:a6:31"
+        vlan: native
+      - name: 'nic2'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address: 100.64.200.12
+        mac_address: "5c:b9:01:8b:99:64"
+        vlan: native
+      - name: 'nic3'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        mac_address: "5c:b9:01:8b:a6:30"
+      - name: 'nic4'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        mac_address: "ec:b1:d7:a2:44:80"
+      - name: 'nic5'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        mac_address: "5c:b9:01:8b:99:65"
diff --git a/hw_config/ericsson-pod2/setup_network.sh b/hw_config/ericsson-pod2/setup_network.sh
new file mode 100755
index 0000000..022394d
--- /dev/null
+++ b/hw_config/ericsson-pod2/setup_network.sh
@@ -0,0 +1,8 @@
+# Adapt this script according to your network setup
+# TODO Get networking info from PDF & IDF
+# TODO Add support in infra engine to update nameserver, etc
+# files with correct info
+#!/bin/bash
+
+echo "no additional network setup needed"
+