From 2c8c96b50cc5d91592052d2b967601033519d69d Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Wed, 21 Nov 2018 11:57:59 +0100 Subject: Rename Ericsson POD2 PDF/IDF The PDF/IDF filenames to use during deployments in CI will be generated dynamically based on which slave the job is running on with the help of the SLAVE_NAME environment variable Jenkins injects into job environment. It will probably look like this pdf=var/pdf.yml idf=var/idf.yml if [[ "$SLAVE_NAME" !~ virtual ]]; then pdf=var/${SLAVE_NAME}-pdf.yml pdf=var/${SLAVE_NAME}-idf.yml fi ./xci-deploy.sh -i $idf -p $pdf deploy-scenario:os-nosdn-nofeature installer-type:osa Change-Id: Ief319ee36292ca888b97e4059a26337ee98dfef2 Signed-off-by: Fatih Degirmenci --- xci/var/ericsson-idf-pod2.yml | 132 --------------------- xci/var/ericsson-pdf-pod2.yml | 269 ------------------------------------------ xci/var/ericsson-pod2-idf.yml | 132 +++++++++++++++++++++ xci/var/ericsson-pod2-pdf.yml | 269 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 401 insertions(+), 401 deletions(-) delete mode 100644 xci/var/ericsson-idf-pod2.yml delete mode 100644 xci/var/ericsson-pdf-pod2.yml create mode 100644 xci/var/ericsson-pod2-idf.yml create mode 100644 xci/var/ericsson-pod2-pdf.yml diff --git a/xci/var/ericsson-idf-pod2.yml b/xci/var/ericsson-idf-pod2.yml deleted file mode 100644 index 8d20ae34..00000000 --- a/xci/var/ericsson-idf-pod2.yml +++ /dev/null @@ -1,132 +0,0 @@ -############################################################################## -# Copyright (c) 2018 Ericsson AB, Mirantis Inc., Enea 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 - installer: ['apex', 'compass4nfv', 'daisy', 'osa'] - net_config: &net_config - admin: - interface: 2 - network: 192.168.122.0 # Untagged, 'PXE/Admin' on wiki, different IP - mask: 24 - mgmt: - interface: 1 - network: 172.29.236.0 - mask: 22 - storage: - interface: 3 - network: 172.29.240.0 # Tagged, not the same with 'storage' on wiki - mask: 22 - private: - interface: 4 - network: 172.29.242.0 # Tagged, not the same with 'private' on wiki - mask: 22 - public: - interface: 2 - network: 192.168.122.0 # Untagged, 'public' on wiki - mask: 24 - gateway: 192.168.122.1 - dns: - - 8.8.8.8 - - 8.8.4.4 - osa: &idf_osa - nodes_roles: - opnfv: [deployment] - node1: [controller] - node2: [compute, storage] - node3: [compute, storage] - node4: [controller] - node5: [controller] - groups: - openstack: - - controller - - compute - - storage - hostnames: - opnfv: opnfv - node1: controller00 - node2: compute00 - node3: compute01 - node4: controller01 - node5: controller02 - network: - # network mapping - network_mapping: - # Management network used by installer components to communicate - net-mgmt: admin - # Storage Network - net-storage: storage - # Internal network for communication between VNF - net-internal: private - # Public network for VNF remote acces (ext-net in Openstack) - net-vnf: public - deployment_host_interfaces: - # Ordered-list, index should be in sync with interface index in PDF - - 'ens1f1' #should be eno49 but it is currently broken - - 'ens1f0' - - 'ens1f1' - - 'ens2f0' - - 'ens2f1' - kubespray: &idf_kubespray - nodes_roles: - opnvf: [opnfv] - node1: [kube-master, etcd, vault] - node2: [kube-node] - node3: [kube-node] - node4: [kube-master, etcd, vault] - node5: [kube-master, etcd, vault] - groups: - k8s-cluster: - - kube-node - - kube-master - hostnames: - opnfv: opnfv - node1: master1 - node2: node1 - node3: node2 - node4: master2 - node5: master3 - - -xci: - pod_name: pod1 - net_config: *net_config - flavors: - mini: - - opnfv - - node1 - - node2 - noha: - - opnfv - - node1 - - node2 - - node3 - ha: - - opnfv - - node1 - - node2 - - node3 - - node4 - - node5 - - # net_config network to be used by the PXE - pxe_network: public - - # As the MAC of generated bridges are generated, we use a list of local - # bridges to create libvirt networks - jumphost_interfaces_bridges: - - name: virbr0 - ip: 192.168.122.1 - - extra_addresses: - opnfv: 192.168.122.2 - - installers: - osa: *idf_osa - kubespray: *idf_kubespray diff --git a/xci/var/ericsson-pdf-pod2.yml b/xci/var/ericsson-pdf-pod2.yml deleted file mode 100644 index 4c7271ec..00000000 --- a/xci/var/ericsson-pdf-pod2.yml +++ /dev/null @@ -1,269 +0,0 @@ ---- -### POD descriptor file ### - -version: 1.0 -details: - pod_owner: Jose Lausuch - contact: jose.lausuch@ericsson.com - lab: Ericsson - location: Rosersberg, Sweden - type: production - link: https://wiki.opnfv.org/display/pharos/CI-ERICSSON-POD2 -############################################################################## -jumphost: - name: CI-POD2-HOST - node: &nodeparams - type: baremetal - vendor: HP - model: ProLiant BL460c Gen9 - arch: x86_64 - cpus: 2 - cpu_cflags: haswell - cores: 12 - memory: 128G - disks: &disks - - name: 'disk1' - disk_capacity: 1200G - disk_type: hdd - disk_interface: scsi - disk_rotation: 15000 - os: ubuntu-16.04 - remote_params: &remoteparas - type: ipmi - versions: - - 1.0 - - 2.0 - user: opnfv - pass: Winter2017 - remote_management: - <<: *remoteparas - address: 172.16.2.11 - mac_address: "58:20:B1:01:8A:F2" - interfaces: - - name: 'nic0' - speed: 1gb - features: 'dpdk|sriov' - address: 172.16.2.11 - mac_address: "ec:b1:d7:a1:a1:10" - vlan: native - - name: 'nic1' - speed: 10gb - features: 'dpdk|sriov' - address: 172.29.236.10 - mac_address: "5c:b9:01:8b:9f:e8" - vlan: native - - name: 'nic2' - speed: 10gb - features: 'dpdk|sriov' - address: 192.168.122.2 - mac_address: "5c:b9:01:8b:9f:e9" - vlan: native - - name: 'nic3' - speed: 10gb - features: 'dpdk|sriov' - address: 172.29.240.10 - mac_address: "5c:b9:01:8b:9f:ec" - vlan: 3010 - - name: 'nic4' - speed: 10gb - features: 'dpdk|sriov' - address: 172.29.242.10 - mac_address: "5c:b9:01:8b:9f:ed" - vlan: 3010 -############################################################################## -nodes: - - name: node1 - node: *nodeparams - disks: *disks - remote_management: - <<: *remoteparas - address: 172.16.2.12 - mac_address: "58:20:B1:01:8B:F0" - interfaces: - - name: 'nic0' - speed: 1gb - features: 'dpdk|sriov' - mac_address: "ec:b1:d7:a2:44:a0" - address: "192.168.122.3" - vlan: native - - name: 'nic1' - speed: 10gb - features: 'dpdk|sriov' - mac_address: "5c:b9:01:8b:a6:94" - address: "172.29.236.11" - vlan: native - - name: 'nic2' - speed: 10gb - features: 'dpdk|sriov' - mac_address: "5c:b9:01:8b:a6:95" - address: "192.168.122.3" - vlan: native - - name: 'nic3' - speed: 10gb - features: 'dpdk|sriov' - mac_address: "5c:b9:01:8b:a6:80" - address: "172.29.240.11" - vlan: 3010 - - name: 'nic4' - speed: 10gb - features: 'dpdk|sriov' - mac_address: "5c:b9:01:8b:a6:81" - address: "172.29.242.11" - vlan: 3010 - ############################################################################ - - name: node2 - node: *nodeparams - disks: *disks - remote_management: - <<: *remoteparas - address: 172.16.2.13 - mac_address: "58:20:B1:01:8E:FC" - interfaces: - - name: 'nic0' - speed: 1gb - features: 'dpdk|sriov' - mac_address: "ec:b1:d7:a2:44:80" - address: "192.168.122.4" - vlan: native - - name: 'nic1' - speed: 10gb - features: 'dpdk|sriov' - mac_address: "5c:b9:01:8b:a6:30" - address: "172.29.236.12" - vlan: native - - name: 'nic2' - speed: 10gb - features: 'dpdk|sriov' - mac_address: "5c:b9:01:8b:a6:31" - address: "192.168.122.4" - vlan: native - - name: 'nic3' - speed: 10gb - features: 'dpdk|sriov' - mac_address: "5c:b9:01:8b:99:64" - address: "172.29.240.12" - vlan: 3010 - - name: 'nic4' - speed: 10gb - features: 'dpdk|sriov' - mac_address: "5c:b9:01:8b:99:65" - address: "172.29.242.12" - vlan: 3010 - ############################################################################ - - name: node3 - node: *nodeparams - disks: *disks - remote_management: - <<: *remoteparas - address: 172.16.2.14 - mac_address: "58:20:B1:01:8D:32" - interfaces: - - name: 'nic0' - speed: 1gb - features: 'dpdk|sriov' - mac_address: "ec:b1:d7:a2:43:c0" - address: "192.168.122.5" - vlan: native - - name: 'nic1' - speed: 10gb - features: 'dpdk|sriov' - mac_address: "5c:b9:01:8b:9d:4c" - address: "172.29.236.13" - vlan: native - - name: 'nic2' - speed: 10gb - features: 'dpdk|sriov' - mac_address: "5c:b9:01:8b:9d:4d" - address: "192.168.122.5" - vlan: native - - name: 'nic3' - speed: 10gb - features: 'dpdk|sriov' - mac_address: "5c:b9:01:8b:9d:6c" - address: "172.29.240.13" - vlan: 3010 - - name: 'nic4' - speed: 10gb - features: 'dpdk|sriov' - mac_address: "5c:b9:01:8b:9d:6d" - address: "172.29.242.13" - vlan: 3010 - ############################################################################ - - name: node4 - node: *nodeparams - disks: *disks - remote_management: - <<: *remoteparas - address: 172.16.2.15 - mac_address: "58:20:B1:01:8B:FC" - interfaces: - - name: 'nic0' - speed: 1gb - features: 'dpdk|sriov' - mac_address: "ec:b1:d7:a1:8b:d0" - address: "192.168.122.6" - vlan: native - - name: 'nic1' - speed: 10gb - features: 'dpdk|sriov' - mac_address: "5c:b9:01:8b:a5:fc" - address: "172.29.236.14" - vlan: native - - name: 'nic2' - speed: 10gb - features: 'dpdk|sriov' - mac_address: "5c:b9:01:8b:a5:fd" - address: "192.168.122.6" - vlan: native - - name: 'nic3' - speed: 10gb - features: 'dpdk|sriov' - mac_address: "5c:b9:01:8b:a6:08" - address: "172.29.240.14" - vlan: 3010 - - name: 'nic4' - speed: 10gb - features: 'dpdk|sriov' - mac_address: "5c:b9:01:8b:a6:09" - address: "172.29.242.14" - vlan: 3010 - ############################################################################ - - name: node5 - node: *nodeparams - disks: *disks - remote_management: - <<: *remoteparas - address: 172.16.2.16 - mac_address: "58:20:B1:01:8F:EA" - interfaces: - - name: 'nic0' - speed: 1gb - features: 'dpdk|sriov' - mac_address: "ec:b1:d7:a1:bd:60" - address: "192.168.122.7" - vlan: native - - name: 'nic1' - speed: 10gb - features: 'dpdk|sriov' - mac_address: "5c:b9:01:8b:a6:e8" - address: "172.29.236.15" - vlan: native - - name: 'nic2' - speed: 10gb - features: 'dpdk|sriov' - mac_address: "5c:b9:01:8b:a6:e9" - address: "192.168.122.7" - vlan: native - - name: 'nic3' - speed: 10gb - features: 'dpdk|sriov' - mac_address: "5c:b9:01:8b:97:14" - address: "172.29.240.15" - vlan: 3010 - - name: 'nic4' - speed: 10gb - features: 'dpdk|sriov' - mac_address: "5c:b9:01:8b:97:15" - address: "172.29.242.15" - vlan: 3010 - diff --git a/xci/var/ericsson-pod2-idf.yml b/xci/var/ericsson-pod2-idf.yml new file mode 100644 index 00000000..8d20ae34 --- /dev/null +++ b/xci/var/ericsson-pod2-idf.yml @@ -0,0 +1,132 @@ +############################################################################## +# Copyright (c) 2018 Ericsson AB, Mirantis Inc., Enea 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 + installer: ['apex', 'compass4nfv', 'daisy', 'osa'] + net_config: &net_config + admin: + interface: 2 + network: 192.168.122.0 # Untagged, 'PXE/Admin' on wiki, different IP + mask: 24 + mgmt: + interface: 1 + network: 172.29.236.0 + mask: 22 + storage: + interface: 3 + network: 172.29.240.0 # Tagged, not the same with 'storage' on wiki + mask: 22 + private: + interface: 4 + network: 172.29.242.0 # Tagged, not the same with 'private' on wiki + mask: 22 + public: + interface: 2 + network: 192.168.122.0 # Untagged, 'public' on wiki + mask: 24 + gateway: 192.168.122.1 + dns: + - 8.8.8.8 + - 8.8.4.4 + osa: &idf_osa + nodes_roles: + opnfv: [deployment] + node1: [controller] + node2: [compute, storage] + node3: [compute, storage] + node4: [controller] + node5: [controller] + groups: + openstack: + - controller + - compute + - storage + hostnames: + opnfv: opnfv + node1: controller00 + node2: compute00 + node3: compute01 + node4: controller01 + node5: controller02 + network: + # network mapping + network_mapping: + # Management network used by installer components to communicate + net-mgmt: admin + # Storage Network + net-storage: storage + # Internal network for communication between VNF + net-internal: private + # Public network for VNF remote acces (ext-net in Openstack) + net-vnf: public + deployment_host_interfaces: + # Ordered-list, index should be in sync with interface index in PDF + - 'ens1f1' #should be eno49 but it is currently broken + - 'ens1f0' + - 'ens1f1' + - 'ens2f0' + - 'ens2f1' + kubespray: &idf_kubespray + nodes_roles: + opnvf: [opnfv] + node1: [kube-master, etcd, vault] + node2: [kube-node] + node3: [kube-node] + node4: [kube-master, etcd, vault] + node5: [kube-master, etcd, vault] + groups: + k8s-cluster: + - kube-node + - kube-master + hostnames: + opnfv: opnfv + node1: master1 + node2: node1 + node3: node2 + node4: master2 + node5: master3 + + +xci: + pod_name: pod1 + net_config: *net_config + flavors: + mini: + - opnfv + - node1 + - node2 + noha: + - opnfv + - node1 + - node2 + - node3 + ha: + - opnfv + - node1 + - node2 + - node3 + - node4 + - node5 + + # net_config network to be used by the PXE + pxe_network: public + + # As the MAC of generated bridges are generated, we use a list of local + # bridges to create libvirt networks + jumphost_interfaces_bridges: + - name: virbr0 + ip: 192.168.122.1 + + extra_addresses: + opnfv: 192.168.122.2 + + installers: + osa: *idf_osa + kubespray: *idf_kubespray diff --git a/xci/var/ericsson-pod2-pdf.yml b/xci/var/ericsson-pod2-pdf.yml new file mode 100644 index 00000000..4c7271ec --- /dev/null +++ b/xci/var/ericsson-pod2-pdf.yml @@ -0,0 +1,269 @@ +--- +### POD descriptor file ### + +version: 1.0 +details: + pod_owner: Jose Lausuch + contact: jose.lausuch@ericsson.com + lab: Ericsson + location: Rosersberg, Sweden + type: production + link: https://wiki.opnfv.org/display/pharos/CI-ERICSSON-POD2 +############################################################################## +jumphost: + name: CI-POD2-HOST + node: &nodeparams + type: baremetal + vendor: HP + model: ProLiant BL460c Gen9 + arch: x86_64 + cpus: 2 + cpu_cflags: haswell + cores: 12 + memory: 128G + disks: &disks + - name: 'disk1' + disk_capacity: 1200G + disk_type: hdd + disk_interface: scsi + disk_rotation: 15000 + os: ubuntu-16.04 + remote_params: &remoteparas + type: ipmi + versions: + - 1.0 + - 2.0 + user: opnfv + pass: Winter2017 + remote_management: + <<: *remoteparas + address: 172.16.2.11 + mac_address: "58:20:B1:01:8A:F2" + interfaces: + - name: 'nic0' + speed: 1gb + features: 'dpdk|sriov' + address: 172.16.2.11 + mac_address: "ec:b1:d7:a1:a1:10" + vlan: native + - name: 'nic1' + speed: 10gb + features: 'dpdk|sriov' + address: 172.29.236.10 + mac_address: "5c:b9:01:8b:9f:e8" + vlan: native + - name: 'nic2' + speed: 10gb + features: 'dpdk|sriov' + address: 192.168.122.2 + mac_address: "5c:b9:01:8b:9f:e9" + vlan: native + - name: 'nic3' + speed: 10gb + features: 'dpdk|sriov' + address: 172.29.240.10 + mac_address: "5c:b9:01:8b:9f:ec" + vlan: 3010 + - name: 'nic4' + speed: 10gb + features: 'dpdk|sriov' + address: 172.29.242.10 + mac_address: "5c:b9:01:8b:9f:ed" + vlan: 3010 +############################################################################## +nodes: + - name: node1 + node: *nodeparams + disks: *disks + remote_management: + <<: *remoteparas + address: 172.16.2.12 + mac_address: "58:20:B1:01:8B:F0" + interfaces: + - name: 'nic0' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "ec:b1:d7:a2:44:a0" + address: "192.168.122.3" + vlan: native + - name: 'nic1' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:a6:94" + address: "172.29.236.11" + vlan: native + - name: 'nic2' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:a6:95" + address: "192.168.122.3" + vlan: native + - name: 'nic3' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:a6:80" + address: "172.29.240.11" + vlan: 3010 + - name: 'nic4' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:a6:81" + address: "172.29.242.11" + vlan: 3010 + ############################################################################ + - name: node2 + node: *nodeparams + disks: *disks + remote_management: + <<: *remoteparas + address: 172.16.2.13 + mac_address: "58:20:B1:01:8E:FC" + interfaces: + - name: 'nic0' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "ec:b1:d7:a2:44:80" + address: "192.168.122.4" + vlan: native + - name: 'nic1' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:a6:30" + address: "172.29.236.12" + vlan: native + - name: 'nic2' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:a6:31" + address: "192.168.122.4" + vlan: native + - name: 'nic3' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:99:64" + address: "172.29.240.12" + vlan: 3010 + - name: 'nic4' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:99:65" + address: "172.29.242.12" + vlan: 3010 + ############################################################################ + - name: node3 + node: *nodeparams + disks: *disks + remote_management: + <<: *remoteparas + address: 172.16.2.14 + mac_address: "58:20:B1:01:8D:32" + interfaces: + - name: 'nic0' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "ec:b1:d7:a2:43:c0" + address: "192.168.122.5" + vlan: native + - name: 'nic1' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:9d:4c" + address: "172.29.236.13" + vlan: native + - name: 'nic2' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:9d:4d" + address: "192.168.122.5" + vlan: native + - name: 'nic3' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:9d:6c" + address: "172.29.240.13" + vlan: 3010 + - name: 'nic4' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:9d:6d" + address: "172.29.242.13" + vlan: 3010 + ############################################################################ + - name: node4 + node: *nodeparams + disks: *disks + remote_management: + <<: *remoteparas + address: 172.16.2.15 + mac_address: "58:20:B1:01:8B:FC" + interfaces: + - name: 'nic0' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "ec:b1:d7:a1:8b:d0" + address: "192.168.122.6" + vlan: native + - name: 'nic1' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:a5:fc" + address: "172.29.236.14" + vlan: native + - name: 'nic2' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:a5:fd" + address: "192.168.122.6" + vlan: native + - name: 'nic3' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:a6:08" + address: "172.29.240.14" + vlan: 3010 + - name: 'nic4' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:a6:09" + address: "172.29.242.14" + vlan: 3010 + ############################################################################ + - name: node5 + node: *nodeparams + disks: *disks + remote_management: + <<: *remoteparas + address: 172.16.2.16 + mac_address: "58:20:B1:01:8F:EA" + interfaces: + - name: 'nic0' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "ec:b1:d7:a1:bd:60" + address: "192.168.122.7" + vlan: native + - name: 'nic1' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:a6:e8" + address: "172.29.236.15" + vlan: native + - name: 'nic2' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:a6:e9" + address: "192.168.122.7" + vlan: native + - name: 'nic3' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:97:14" + address: "172.29.240.15" + vlan: 3010 + - name: 'nic4' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:97:15" + address: "172.29.242.15" + vlan: 3010 + -- cgit