Updated PDF and IDF for Ericsson Hardware

This change updates the config files for Ericsson POD 1
and removes existing Ericsson POD 2 configuration based
on recent hardware and software updates.

Change-Id: I4d26be681b4d805029e5de9c91f96a7634974990
Signed-off-by: Rihab Banday <rihab.banday@ericsson.com>
Reviewed-on: https://gerrit.opnfv.org/gerrit/c/kuberef/+/72149
Tested-by: jenkins-ci <jenkins-opnfv-ci@opnfv.org>
Reviewed-by: Georg Kunz <georg.kunz@ericsson.com>
Reviewed-by: Michael Pedersen <michaelx.pedersen@intel.com>

3 files changed, 0 insertions, 306 deletions

diff --git a/hw_config/ericsson-pod2/idf.yaml b/hw_config/ericsson-pod2/idf.yaml
deleted file mode 100644
index 9aee186..0000000
--- a/hw_config/ericsson-pod2/idf.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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:
-        - 8.8.8.8
-    public:
-      interface: 1
-      vlan: 80
-      network: 100.64.201.6
-      gateway: 100.64.201.1
-      mask: 24
-      dns:
-        - 8.8.8.8
-  kubespray: &idf_kubespray
-    nodes_roles:
-      node1: [k8s-cluster, kube-master, etcd, vault]
-      node2: [k8s-cluster, kube-node]
-      node3: [k8s-cluster, kube-node]
-      node4: [k8s-cluster, kube-node]
-      node5: [k8s-cluster, kube-node]
-    groups:
-      k8s-cluster:
-        - kube-node
-        - kube-master
-    hostnames:
-      node1: master1
-      node2: node1
-      node3: node2
-      node4: node3
-      node5: node4
-    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-pod2
-  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
deleted file mode 100644
index 6c23a38..0000000
--- a/hw_config/ericsson-pod2/pdf.yaml
+++ /dev/null
@@ -1,228 +0,0 @@
----
-# 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
-      mac_address: 52:54:00:4a:e8:2f
-##############################################################################
-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.12
-      - name: 'nic2'
-        speed: 10gb
-        features: 'dpdk|sriov'
-        mac_address: "5c:b9:01:8b:a6:80"
-        address: 100.64.201.12
-        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.13
-        mac_address: "5c:b9:01:8b:a6:31"
-        vlan: native
-      - name: 'nic2'
-        speed: 10gb
-        features: 'dpdk|sriov'
-        address: 100.64.200.13
-        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"
-  ############################################################################
-  - name: node3
-    node: *nodeparams
-    disks: *disks
-    remote_management:
-      <<: *remoteparas
-      address: 172.16.2.14
-      mac_address: "58:20:B1:01:8D:32"
-    interfaces:
-      - name: 'nic1'
-        speed: 10gb
-        features: 'dpdk|sriov'
-        mac_address: "5c:b9:01:8b:9d:4d"
-        address: 10.0.20.14
-        vlan: native
-      - name: 'nic2'
-        speed: 10gb
-        features: 'dpdk|sriov'
-        mac_address: "5c:b9:01:8b:9d:6c"
-        address: 100.64.200.14
-        vlan: native
-      - name: 'nic3'
-        speed: 1gb
-        features: 'dpdk|sriov'
-        mac_address: "ec:b1:d7:a2:43:c0"
-        vlan: native
-      - name: 'nic4'
-        speed: 10gb
-        features: 'dpdk|sriov'
-        mac_address: "5c:b9:01:8b:9d:4c"
-      - name: 'nic5'
-        speed: 10gb
-        features: 'dpdk|sriov'
-        mac_address: "5c:b9:01:8b:9d:6d"
-  ############################################################################
-  - name: node4
-    node: *nodeparams
-    disks: *disks
-    remote_management:
-      <<: *remoteparas
-      address: 172.16.2.15
-      mac_address: "58:20:B1:01:8B:FC"
-    interfaces:
-      - name: 'nic1'
-        speed: 10gb
-        features: 'dpdk|sriov'
-        mac_address: "5c:b9:01:8b:a5:fd"
-        address: 10.0.20.15
-        vlan: native
-      - name: 'nic2'
-        speed: 10gb
-        features: 'dpdk|sriov'
-        mac_address: "5c:b9:01:8b:a6:08"
-        address: 100.64.200.15
-        vlan: native
-      - name: 'nic3'
-        speed: 1gb
-        features: 'dpdk|sriov'
-        mac_address: "ec:b1:d7:a1:8b:d0"
-      - name: 'nic4'
-        speed: 10gb
-        features: 'dpdk|sriov'
-        mac_address: "5c:b9:01:8b:a5:fc"
-      - name: 'nic5'
-        speed: 10gb
-        features: 'dpdk|sriov'
-        mac_address: "5c:b9:01:8b:a6:09"
-  ############################################################################
-  - name: node5
-    node: *nodeparams
-    disks: *disks
-    remote_management:
-      <<: *remoteparas
-      address: 172.16.2.16
-      mac_address: "58:20:B1:01:8F:EA"
-    interfaces:
-      - name: 'nic1'
-        speed: 10gb
-        features: 'dpdk|sriov'
-        mac_address: "5c:b9:01:8b:a6:e9"
-        address: 10.0.20.16
-        vlan: native
-      - name: 'nic2'
-        speed: 10gb
-        features: 'dpdk|sriov'
-        mac_address: "5c:b9:01:8b:97:14"
-        address: 100.64.200.16
-        vlan: native
-      - name: 'nic3'
-        speed: 1gb
-        features: 'dpdk|sriov'
-        mac_address: "ec:b1:d7:a1:bd:60"
-      - name: 'nic4'
-        speed: 10gb
-        features: 'dpdk|sriov'
-        mac_address: "5c:b9:01:8b:a6:e8"
-      - name: 'nic5'
-        speed: 10gb
-        features: 'dpdk|sriov'
-        mac_address: "5c:b9:01:8b:97:15"
diff --git a/hw_config/ericsson-pod2/setup_network.sh b/hw_config/ericsson-pod2/setup_network.sh
deleted file mode 100755
index 4696f6b..0000000
--- a/hw_config/ericsson-pod2/setup_network.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-# 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
-
-echo "no additional network setup needed"
-