From af104f92b348c51e20f5fbf3be78f532864804ab Mon Sep 17 00:00:00 2001 From: Rihab Banday Date: Tue, 21 Jul 2020 10:49:45 +0000 Subject: Initial structure for e2e deployment scripting This patch includes the initial skeleton of the e2e deployment tooling. This is expected to evolve as further development progresses. Change-Id: Ie1e334e672acb2213e8f6c2174506b685f826f98 Signed-off-by: Rihab Banday --- hw_config/intel/idf.yaml | 60 +++++++++++++++++ hw_config/intel/pdf.yaml | 137 +++++++++++++++++++++++++++++++++++++++ hw_config/intel/setup_network.sh | 11 ++++ 3 files changed, 208 insertions(+) create mode 100644 hw_config/intel/idf.yaml create mode 100644 hw_config/intel/pdf.yaml create mode 100755 hw_config/intel/setup_network.sh (limited to 'hw_config/intel') diff --git a/hw_config/intel/idf.yaml b/hw_config/intel/idf.yaml new file mode 100644 index 0000000..d9127ff --- /dev/null +++ b/hw_config/intel/idf.yaml @@ -0,0 +1,60 @@ +# SPDX-license-identifier: Apache-2.0 +############################################################################## +# Copyright (c) 2020 +# 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 +############################################################################## +idf: + version: 0.1 + net_config: &net_config + oob: + interface: 0 + network: 10.10.190.0 + gateway: 10.10.190.1 + vlan: native + mask: 24 + dns: + - 8.8.8.8 + admin: # admin + interface: 1 + vlan: 191 + network: 10.10.191.0 + mask: 24 + bridge: br-name + 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: pod19-node1 + node2: pod19-node2 + network: + # network mapping + network_mapping: + net_admin: oob + # Public network + net_public: oob + # Management network used by installer components to communicate + net_mgmt: oob + +engine: + pod_name: pod19-jump + 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: oob + + # interface to be used by the PXE + pxe_interface: ens4 + + installers: + kubespray: *idf_kubespray diff --git a/hw_config/intel/pdf.yaml b/hw_config/intel/pdf.yaml new file mode 100644 index 0000000..c97f29a --- /dev/null +++ b/hw_config/intel/pdf.yaml @@ -0,0 +1,137 @@ +# SPDX-license-identifier: Apache-2.0 +############################################################################## +# Copyright (c) 2020 +# 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 +############################################################################## +### POD descriptor file ### + +version: 1.0 +details: + pod_owner: Intel + contact: Intel + lab: Intel Pharos Lab + location: somewhere + type: baremetal + link: http://wiki.opnfv.org/display/pharos/Intel+Hosting +############################################################################## +jumphost: + name: pod19-jump + node: &nodeparas + type: baremetal + vendor: Intel + model: pc + arch: x86_64 + cpus: 80 + cpu_cflags: broadwell + cores: 20 + memory: 192G + disks: &disks + - name: 'Intel SSDSC2KB48' + disk_capacity: 447G + disk_type: hdd + disk_interface: scsi + os: ubuntu1804 + remote_params: &remoteparas + type: + - ipmi + user: root + pass: root + remote_management: + <<: *remoteparas + address: 10.10.190.10 + mac_address: "A4:BF:01:00:03:D1" + interfaces: + - name: 'nic1' + address: 10.10.190.211 + mac_address: "52:54:00:4a:e8:2d" + vlan: native + - name: 'nic2' + address: 192.168.122.113 + mac_address: "52:54:00:74:b4:66" + vlan: native + - name: 'nic3' + address: 10.10.192.1 + mac_address: "3c:fd:fe:aa:be:24" + vlan: native +############################################################################## +nodes: + - name: node1 + node: *nodeparas + disks: *disks + remote_management: + <<: *remoteparas + address: 10.10.190.11 + mac_address: "A4:BF:01:00:06:15" + interfaces: + - name: 'nic1' + speed: 1gb + features: + address: 10.10.190.202 + mac_address: "a4:bf:01:4b:55:f4" + vlan: native + - name: 'nic2' + speed: 1gb + features: + address: 192.168.11.211 + mac_address: "a4:bf:01:4b:55:f5" + vlan: 191 + - name: 'nic3' + speed: 10gb + features: 'dpdk|sriov' + address: 10.10.192.2 + mac_address: "3c:fd:fe:aa:b8:f4" + vlan: native + - name: 'nic4' + speed: 10gb + features: 'dpdk|sriov' + address: 10.10.193.2 + mac_address: "3c:fd:fe:aa:b8:f5" + vlan: native + - name: 'nic5' + speed: 10gb + features: 'dpdk|sriov' + address: 10.10.195.2 + mac_address: "00:00:00:00:00:00" + vlan: native +######################################################################## + - name: node2 + node: *nodeparas + disks: *disks + remote_management: + <<: *remoteparas + address: 10.10.190.12 + mac_address: "A4:BF:01:00:09:7B" + interfaces: + - name: 'nic1' + speed: 1gb + features: + address: 10.10.190.203 + mac_address: "a4:bf:01:4b:4f:9c" + vlan: native + - name: 'nic2' + speed: 1gb + features: + address: 10.10.190.203 + mac_address: "a4:bf:01:4b:4f:9d" + vlan: 191 + - name: 'nic3' + speed: 10gb + features: 'dpdk|sriov' + address: 10.10.192.3 + mac_address: "3c:fd:fe:aa:b7:fc" + vlan: native + - name: 'nic4' + speed: 10gb + features: 'dpdk|sriov' + address: 10.10.193.3 + mac_address: "3c:fd:fe:aa:b7:fd" + vlan: native + - name: 'nic5' + speed: 10gb + features: 'dpdk|sriov' + address: 10.10.195.3 + mac_address: "00:00:00:00:00:00" + vlan: 1193 diff --git a/hw_config/intel/setup_network.sh b/hw_config/intel/setup_network.sh new file mode 100755 index 0000000..a6ff6df --- /dev/null +++ b/hw_config/intel/setup_network.sh @@ -0,0 +1,11 @@ +# 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 nameserver 8.8.8.8 > /etc/resolv.conf +sed -i 's/NM_CONTROLLED=yes/NM_CONTROLLED=no/g' /etc/sysconfig/network-scripts/ifcfg-eth2 +echo GATEWAY=10.10.190.1 >> /etc/sysconfig/network-scripts/ifcfg-eth2 +ifup eth2 + -- cgit 1.2.3-korg