Merge "update BII pod1 PDF for Euphrates install"
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Mon, 22 Jan 2018 16:49:07 +0000 (16:49 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Mon, 22 Jan 2018 16:49:07 +0000 (16:49 +0000)
26 files changed:
config/installers/apex/pod_config.yaml.j2
config/installers/compass4nfv/network.yml.j2
config/installers/compass4nfv/network_ocl.yml.j2
config/installers/compass4nfv/network_onos.yml.j2
config/installers/compass4nfv/network_openo.yml.j2
config/installers/compass4nfv/os-nosdn-nofeature-ha.yml.j2
config/installers/compass4nfv/os-nosdn-openo-ha.yml.j2
config/installers/compass4nfv/os-ocl-nofeature-ha.yml.j2
config/installers/compass4nfv/os-odl_l2-moon-ha.yml.j2
config/installers/compass4nfv/os-odl_l2-nofeature-ha.yml.j2
config/installers/compass4nfv/os-odl_l3-nofeature-ha.yml.j2
config/installers/compass4nfv/os-onos-nofeature-ha.yml.j2
config/installers/compass4nfv/os-onos-sfc-ha.yml.j2
config/installers/daisy/network.yaml.j2
config/installers/daisy/pod_config.yaml.j2
config/installers/fuel/pod_config.yml.j2
config/installers/joid/pod_config.yaml.j2
config/pdf/pod1.encrypted.yaml
config/pdf/pod1.yaml
config/utils/README.eyaml.rst
config/utils/check-jinja2.sh
config/utils/config.example.yaml
config/utils/generate_config.py
labs/arm/idf-pod7.yaml [new file with mode: 0644]
labs/arm/pod7.yaml [new file with mode: 0644]
labs/nokia/pod1.yaml [new file with mode: 0644]

index b681215..d4db9ef 100644 (file)
@@ -1,11 +1,18 @@
+##############################################################################
+# Copyright (c) 2018 Red Hat Inc. 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
+##############################################################################
 ---
 nodes:
   node1:
     mac_address: "{{ conf['nodes'][0]['remote_management']['mac_address'] }}"
     ipmi_ip: {{ conf['nodes'][0]['remote_management']['address'] }}
-    ipmi_user: {{ conf['jumphost']['remote_params']['user'] }}
-    ipmi_pass: {{ conf['jumphost']['remote_params']['pass'] }}
-    pm_type: "pxe_{{ conf['jumphost']['remote_params']['type'] }}tool"
+    ipmi_user: {{ conf['nodes'][0]['remote_management']['user'] }}
+    ipmi_pass: {{ conf['nodes'][0]['remote_management']['pass'] }}
+    pm_type: "pxe_{{ conf['nodes'][0]['remote_management']['type'] }}tool"
     cpus: {{ conf['nodes'][0]['node']['cpus'] }}
     memory: {{ conf['nodes'][0]['node']['memory'] }}
     disk: 40
@@ -15,9 +22,9 @@ nodes:
   node2:
     mac_address: "{{ conf['nodes'][1]['remote_management']['mac_address'] }}"
     ipmi_ip: {{ conf['nodes'][1]['remote_management']['address'] }}
-    ipmi_user: {{ conf['jumphost']['remote_params']['user'] }}
-    ipmi_pass: {{ conf['jumphost']['remote_params']['pass'] }}
-    pm_type: "pxe_{{ conf['jumphost']['remote_params']['type'] }}tool"
+    ipmi_user: {{ conf['nodes'][1]['remote_management']['user'] }}
+    ipmi_pass: {{ conf['nodes'][1]['remote_management']['pass'] }}
+    pm_type: "pxe_{{ conf['nodes'][1]['remote_management']['type'] }}tool"
     cpus: {{ conf['nodes'][1]['node']['cpus'] }}
     memory: {{ conf['nodes'][1]['node']['memory'] }}
     disk: 40
@@ -27,9 +34,9 @@ nodes:
   node3:
     mac_address: "{{ conf['nodes'][2]['remote_management']['mac_address'] }}"
     ipmi_ip: {{ conf['nodes'][2]['remote_management']['address'] }}
-    ipmi_user: {{ conf['jumphost']['remote_params']['user'] }}
-    ipmi_pass: {{ conf['jumphost']['remote_params']['pass'] }}
-    pm_type: "pxe_{{ conf['jumphost']['remote_params']['type'] }}tool"
+    ipmi_user: {{ conf['nodes'][2]['remote_management']['user'] }}
+    ipmi_pass: {{ conf['nodes'][2]['remote_management']['pass'] }}
+    pm_type: "pxe_{{ conf['nodes'][2]['remote_management']['type'] }}tool"
     cpus: {{ conf['nodes'][2]['node']['cpus'] }}
     memory: {{ conf['nodes'][2]['node']['memory'] }}
     disk: 40
@@ -39,9 +46,9 @@ nodes:
   node4:
     mac_address: "{{ conf['nodes'][3]['remote_management']['mac_address'] }}"
     ipmi_ip: {{ conf['nodes'][3]['remote_management']['address'] }}
-    ipmi_user: {{ conf['jumphost']['remote_params']['user'] }}
-    ipmi_pass: {{ conf['jumphost']['remote_params']['pass'] }}
-    pm_type: "pxe_{{ conf['jumphost']['remote_params']['type'] }}tool"
+    ipmi_user: {{ conf['nodes'][3]['remote_management']['user'] }}
+    ipmi_pass: {{ conf['nodes'][3]['remote_management']['pass'] }}
+    pm_type: "pxe_{{ conf['nodes'][3]['remote_management']['type'] }}tool"
     cpus: {{ conf['nodes'][3]['node']['cpus'] }}
     memory: {{ conf['nodes'][3]['node']['memory'] }}
     disk: 40
@@ -51,9 +58,9 @@ nodes:
   node5:
     mac_address: "{{ conf['nodes'][4]['remote_management']['mac_address'] }}"
     ipmi_ip: {{ conf['nodes'][4]['remote_management']['address'] }}
-    ipmi_user: {{ conf['jumphost']['remote_params']['user'] }}
-    ipmi_pass: {{ conf['jumphost']['remote_params']['pass'] }}
-    pm_type: "pxe_{{ conf['jumphost']['remote_params']['type'] }}tool"
+    ipmi_user: {{ conf['nodes'][4]['remote_management']['user'] }}
+    ipmi_pass: {{ conf['nodes'][4]['remote_management']['pass'] }}
+    pm_type: "pxe_{{ conf['nodes'][4]['remote_management']['type'] }}tool"
     cpus: {{ conf['nodes'][4]['node']['cpus'] }}
     memory: {{ conf['nodes'][4]['node']['memory'] }}
     disk: 40
index a98cc4a..b84c201 100644 (file)
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others.
+# Copyright (c) 2018 HUAWEI TECHNOLOGIES CO.,LTD and others.
 #
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
index 4d1342d..f435538 100644 (file)
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others.
+# Copyright (c) 2018 HUAWEI TECHNOLOGIES CO.,LTD and others.
 #
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
index 90174c8..7213e77 100644 (file)
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others.
+# Copyright (c) 2018 HUAWEI TECHNOLOGIES CO.,LTD and others.
 #
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
index 37b34c7..9e3c6f0 100644 (file)
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others.
+# Copyright (c) 2018 HUAWEI TECHNOLOGIES CO.,LTD and others.
 #
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
index 2dcf048..bb235fb 100644 (file)
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others.
+# Copyright (c) 2018 HUAWEI TECHNOLOGIES CO.,LTD and others.
 #
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
index 6deb19d..9e7e01c 100644 (file)
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others.
+# Copyright (c) 2018 HUAWEI TECHNOLOGIES CO.,LTD and others.
 #
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
index d03c7e8..c7272cf 100644 (file)
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others.
+# Copyright (c) 2018 HUAWEI TECHNOLOGIES CO.,LTD and others.
 #
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
index d3d8aa1..72d3f4c 100644 (file)
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others.
+# Copyright (c) 2018 HUAWEI TECHNOLOGIES CO.,LTD and others.
 #
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
index 1ba947a..3a0c222 100644 (file)
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others.
+# Copyright (c) 2018 HUAWEI TECHNOLOGIES CO.,LTD and others.
 #
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
index d81769c..d019c23 100644 (file)
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others.
+# Copyright (c) 2018 HUAWEI TECHNOLOGIES CO.,LTD and others.
 #
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
index 8c731a5..2adce44 100644 (file)
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others.
+# Copyright (c) 2018 HUAWEI TECHNOLOGIES CO.,LTD and others.
 #
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
index bbc4723..230a601 100644 (file)
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others.
+# Copyright (c) 2018 HUAWEI TECHNOLOGIES CO.,LTD and others.
 #
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
index f5ac615..1fad1ac 100644 (file)
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2017 ZTE Corporation and others.
+# Copyright (c) 2018 ZTE Corporation and others.
 #
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
index 8057f68..30147a5 100644 (file)
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2017 ZTE Corporation and others.
+# Copyright (c) 2018 ZTE Corporation and others.
 #
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
index 8a4d869..7443096 100644 (file)
@@ -1,3 +1,10 @@
+##############################################################################
+# Copyright (c) 2018 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
+##############################################################################
 ---
 {%- if conf.idf is defined and conf.idf.fuel is defined -%}
   {%- if conf.idf.net_config is defined -%}
@@ -39,6 +46,7 @@ parameters:
     opnfv_jump_bridge_public: {{ conf.idf.fuel.jumphost.bridges.public }}
 
     opnfv_infra_config_address: {{ net_mgmt | ipaddr_index(100) }}
+    opnfv_infra_config_pxe_address: {{ net_admin | ipaddr_index(2) }}
     opnfv_infra_maas_node01_address: {{ net_mgmt | ipaddr_index(3) }}
     opnfv_infra_maas_node01_deploy_address: {{ net_admin | ipaddr_index(3) }}
     opnfv_infra_kvm_address: {{ net_mgmt | ipaddr_index(140) }}
@@ -47,9 +55,8 @@ parameters:
     opnfv_infra_kvm_node03_address: {{ net_mgmt | ipaddr_index(143) }}
 
     opnfv_infra_maas_pxe_network_address: {{ net_admin }}
-    opnfv_infra_maas_pxe_address: {{ net_admin | ipaddr_index(3) }}
-    opnfv_infra_maas_pxe_start_address: {{ net_admin | ipaddr_index(5) }}
-    opnfv_infra_maas_pxe_end_address: {{ net_admin | ipaddr_index(250) }}
+    opnfv_infra_maas_pxe_start_address: {{ net_admin | ipaddr_index(4) }}
+    opnfv_infra_maas_pxe_end_address: {{ net_admin | ipaddr_index(100) }}
 
     opnfv_openstack_gateway_node01_address: {{ net_mgmt | ipaddr_index(124) }}
     opnfv_openstack_gateway_node02_address: {{ net_mgmt | ipaddr_index(125) }}
@@ -60,6 +67,7 @@ parameters:
     opnfv_openstack_proxy_address: {{ net_public | ipaddr_index(103) }}
     opnfv_openstack_proxy_node01_address: {{ net_public | ipaddr_index(104) }}
     opnfv_openstack_proxy_node02_address: {{ net_public | ipaddr_index(105) }}
+    opnfv_openstack_proxy_control_address: {{ net_mgmt | ipaddr_index(103) }}
     opnfv_openstack_proxy_node01_control_address: {{ net_mgmt | ipaddr_index(104) }}
     opnfv_openstack_proxy_node02_control_address: {{ net_mgmt | ipaddr_index(105) }}
     opnfv_openstack_control_address: {{ net_mgmt | ipaddr_index(10) }}
index 4bb49d5..e18ba86 100644 (file)
@@ -1,3 +1,10 @@
+##############################################################################
+# Copyright (c) 2018 Canonical Ltd. 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
+##############################################################################
 ---
 lab:
   location: intel
index 5679de6..c1e8f78 100644 (file)
@@ -1,3 +1,10 @@
+##############################################################################
+# Copyright (c) 2018 Intel Corporation, 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
+##############################################################################
 ---
 ### POD descriptor file ###
 
index a2a1e55..c2d0734 100644 (file)
@@ -1,3 +1,10 @@
+##############################################################################
+# Copyright (c) 2018 Intel Corporation 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
+##############################################################################
 ---
 ### POD descriptor file ###
 
index 0031d9d..1f58426 100644 (file)
@@ -1,6 +1,6 @@
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
 .. SPDX-License-Identifier: CC-BY-4.0
-.. (c) 2017 OPNFV and others.
+.. (c) 2018 OPNFV and others.
 
 Use eyaml to decrypt secret values
 ==================================
index 3c5e516..960f288 100755 (executable)
@@ -1,7 +1,7 @@
 #!/bin/bash
 # SPDX-license-identifier: Apache-2.0
 ##############################################################################
-# Copyright (c) 2016 Linux Foundation and others.
+# Copyright (c) 2018 Linux Foundation 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
@@ -12,8 +12,15 @@ set +x
 set +o errexit
 export PATH=$PATH:/usr/local/bin/
 
+# Optional filtering of test matrix: per-lab, per-pod, per-installer
+# e.g. To check zte-pod{2,3} against all installer adapters:
+# ./config/utils/check-jinja2.sh zte 'pod(2|3)'
+FILTER_LAB=${1:-*}                           # e.g. 'zte'  (glob)
+FILTER_POD=${2:-(pod|virtual)[[:digit:]]+}   # e.g. 'pod1' (regex)
+FILTER_IA=${3:-*}                            # e.g. 'fuel' (glob)
+
 GEN_CFG='./config/utils/generate_config.py'
-INSTALLER_ADAPTERS='./config/installers/*'
+INSTALLER_ADAPTERS="./config/installers/${FILTER_IA}"
 TMPF='/tmp/out.yml' # should be outside Jenkins WS to prevent data leakage
 RC=0
 
@@ -25,6 +32,7 @@ for adapter in 'PDF Verify Matrix' ${INSTALLER_ADAPTERS}; do
 done
 
 # Iterate all PDFs, check with each installer adapter, log results
+# shellcheck disable=SC2086
 while IFS= read -r lab_config; do
     SUMMARY+="\n${lab_config#labs/};"
     echo "###################### ${lab_config} ######################"
@@ -52,7 +60,8 @@ while IFS= read -r lab_config; do
         done < <(find "${adapter}" -name '*.j2')
         SUMMARY+="${pdf_yaml_pass}/${pdf_inst_pass}/${pdf_inst};"
     done
-done < <(find 'labs' -name 'pod*.yaml')
+done < <(find labs/${FILTER_LAB} -regextype egrep \
+                                 -regex "labs/.+/${FILTER_POD}.yaml")
 rm -f "${TMPF}"
 
 cat <<EOF
index 084d11d..3a10a14 100644 (file)
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2017 OPNFV and others.
+# Copyright (c) 2018 OPNFV and others.
 #
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
index cf558e2..d935822 100755 (executable)
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 ##############################################################################
-# Copyright (c) 2017 OPNFV and others.
+# Copyright (c) 2018 OPNFV and others.
 #
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
diff --git a/labs/arm/idf-pod7.yaml b/labs/arm/idf-pod7.yaml
new file mode 100644 (file)
index 0000000..6b41363
--- /dev/null
@@ -0,0 +1,79 @@
+##############################################################################
+# Copyright (c) 2017 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
+##############################################################################
+---
+### ARM POD 7 installer descriptor file ###
+
+idf:
+  version: 0.1
+  net_config:
+    oob:
+      ip-range: 10.0.16.2-10.0.16.6
+      vlan: native
+    admin:
+      interface: 0
+      vlan: native
+      network: 192.168.11.0
+      mask: 24
+    mgmt:
+      interface: 1
+      vlan: 2343
+      network: 172.16.10.0
+      mask: 24
+    storage:
+      interface: 1
+      vlan: 2344
+      network: 10.2.0.0
+      mask: 24
+    private:
+      interface: 1
+      vlan: 2345
+      network: 10.1.0.0
+      mask: 24
+    public:
+      interface: 1
+      vlan: native
+      network: 10.0.16.0
+      mask: 24
+      gateway: 10.0.16.254
+      dns:
+        - 8.8.8.8
+        - 8.8.4.4
+  fuel:
+    jumphost:
+      bridges:
+        admin: 'admin15_br0'
+        mgmt: 'mgmt15_br0'
+        private: ~
+        public: 'public15_br0'
+    network:
+      node:
+        # Ordered-list, index should be in sync with node index in PDF
+        - interfaces: &interfaces_a
+            # Ordered-list, index should be in sync with interface index in PDF
+            - 'enP5s3'
+            - 'enP2p1s0f2'
+            - 'enP2p1s0f1'
+            - 'enP2p1s0f3'
+          busaddr: &busaddr_a
+            # Bus-info reported by `ethtool -i ethX`
+            - '0005:90:00.0'
+            - '0002:01:00.2'
+            - '0002:01:00.1'
+            - '0002:01:00.3'
+        - interfaces: *interfaces_a
+          busaddr: *busaddr_a
+        - interfaces: *interfaces_a
+          busaddr: *busaddr_a
+        - interfaces: &interfaces_b
+            - 'eth0'
+            - 'eth1'
+          busaddr: &busaddr_b
+            - 'e0700000.xgmac'
+            - 'e0900000.xgmac'
+        - interfaces: *interfaces_b
+          busaddr: *busaddr_b
diff --git a/labs/arm/pod7.yaml b/labs/arm/pod7.yaml
new file mode 100644 (file)
index 0000000..bb62479
--- /dev/null
@@ -0,0 +1,241 @@
+##############################################################################
+# Copyright (c) 2018 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
+##############################################################################
+---
+### Enea ARM POD 7 descriptor file ###
+
+version: 1.0
+details:
+  pod_owner: ENEA AB
+  contact: dan.lilliehorn@enea.com
+  lab: ENEA lab
+  location: Stockholm, Sweden
+  type: production
+  link: https://wiki.opnfv.org/display/pharos/Enea+Hosting
+##############################################################################
+jumphost:
+  name: jenkins-slave-arm-pod7
+  node:
+    type: baremetal
+    vendor: AppliedMicro
+    model: XGene 1
+    arch: aarch64
+    cpus: 1
+    cpu_cflags: fp asimd evtstrm cpuid
+    cores: 8
+    memory: 32G
+  disks:
+    # /dev/sda
+    - name: disk1
+      disk_capacity: 120G
+      disk_type: ssd
+      disk_interface: sata
+      disk_rotation: 0
+    # /dev/sdb
+    - name: disk2
+      disk_capacity: 1T
+      disk_type: hdd
+      disk_interface: sata
+      disk_rotation: 7200
+    # /dev/sdc
+    - name: disk3
+      disk_capacity: 1T
+      disk_type: hdd
+      disk_interface: sata
+      disk_rotation: 7200
+  os: ubuntu-16.04
+  remote_params: &remote_params
+    type: ipmi
+    versions:
+      - 2.0
+    user: admin
+    pass: admin
+  remote_management:
+    <<: *remote_params
+    address: 0.0.0.0
+    mac_address: "00:00:00:00:00:00"
+  interfaces:
+    # eth0, Not connected
+    - mac_address: "00:01:73:02:3b:28"
+      address: 192.168.11.1
+      speed: 1gb
+      features: ''
+      name: 'nic1'
+    # eth1, Connected for PXE
+    - mac_address: "00:01:73:02:3b:29"
+      speed: 1gb
+      features: ''
+      name: 'nic2'
+    # eth2, Not connected
+    - mac_address: "00:01:73:02:3b:2a"
+      speed: 1gb
+      features: ''
+      name: 'nic3'
+    # eth3, Connected for truck traffic
+    - mac_address: "00:01:73:02:3b:2b"
+      speed: 10gb
+      features: ''
+      name: 'nic4'
+##############################################################################
+nodes:
+  - name: cn8890-6
+    node: &nodeparams_a
+      type: baremetal
+      vendor: Cavium
+      model: ThunderX
+      arch: aarch64
+      cpus: 1
+      cpu_cflags: fp asimd evtstrm aes pmull sha1 sha2 crc32
+      cores: 48
+      memory: 128G
+    disks: &disks_a
+      - name: 'disk1'
+        disk_capacity: 500G
+        disk_type: hdd
+        disk_interface: sata
+        disk_rotation: 7200
+    remote_management:
+      <<: *remote_params
+      address: 10.0.16.2
+      mac_address: "40:8D:5C:BA:D2:32"
+    interfaces:
+      # enP5s3, Connected, used only for admin/PXE
+      - mac_address: "68:05:ca:3d:93:14"
+        speed: 1gb
+        features: ''
+        name: 'nic1'
+      # enP2p1s0f2, Connected, trunk for all other VLANs
+      - mac_address: "00:0f:b7:03:00:c1"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic2'
+      # enP2p1s0f1, Not connected
+      - mac_address: "00:0f:b7:03:00:c0"
+        speed: 1gb
+        features: ''
+        name: 'nic3'
+      # enP2p1s0f3, Not connected
+      - mac_address: "00:0f:b7:03:00:c2"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic4'
+  ############################################################################
+  - name: cn8890-8
+    node: *nodeparams_a
+    disks: *disks_a
+    remote_management:
+      <<: *remote_params
+      address: 10.0.16.3
+      mac_address: "40:8D:5C:BA:B9:60"
+    interfaces:
+      # enP5s3, Connected, used only for admin/PXE
+      - mac_address: "68:05:ca:3f:7f:f3"
+        speed: 1gb
+        features: ''
+        name: 'nic1'
+      # enP2p1s0f2, Connected, trunk for all other VLANs
+      - mac_address: "00:0f:b7:05:00:c1"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic2'
+      # enP2p1s0f1, Not connected
+      - mac_address: "00:0f:b7:05:00:c0"
+        speed: 1gb
+        features: ''
+        name: 'nic3'
+      # enP2p1s0f3, Not connected
+      - mac_address: "00:0f:b7:05:00:c2"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic4'
+  ############################################################################
+  - name: cn8890-10
+    node: *nodeparams_a
+    disks: *disks_a
+    remote_management:
+      <<: *remote_params
+      address: 10.0.16.4
+      mac_address: "40:8D:5C:BA:B9:65"
+    interfaces:
+      # enP5s3, Connected, used only for admin/PXE
+      - mac_address: "68:05:ca:3d:93:0f"
+        speed: 1gb
+        features: ''
+        name: 'nic1'
+      # enP2p1s0f2, Connected, trunk for all other VLANs
+      - mac_address: "00:0f:b7:07:00:c1"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic2'
+      # enP2p1s0f1, Not connected
+      - mac_address: "00:0f:b7:07:00:c0"
+        speed: 1gb
+        features: ''
+        name: 'nic3'
+      # enP2p1s0f3, Not connected
+      - mac_address: "00:0f:b7:07:00:c2"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic4'
+  ############################################################################
+  - name: softiron-1
+    node: &nodeparams_b
+      type: baremetal
+      vendor: American Megatrends Inc
+      model: Overdrive/Supercharger
+      arch: aarch64
+      cpus: 1
+      cpu_cflags: fp asimd evtstrm aes pmull sha1 sha2 crc32
+      cores: 8
+      memory: 32G
+    disks: &disks_b
+      # dev/sda
+      - name: 'disk1'
+        disk_capacity: 128G
+        disk_type: ssd
+        disk_interface: sata
+        disk_rotation: 0
+      # /dev/sdb
+      - name: 'disk2'
+        disk_capacity: 2T
+        disk_type: hdd
+        disk_interface: sata
+        disk_rotation: 7200
+    remote_management:
+      <<: *remote_params
+      address: 10.0.16.5
+      mac_address: "E0:FF:F7:00:04:21"
+    interfaces:
+      # eth0, Connected, used only for admin/PXE
+      - mac_address: "e0:ff:f7:00:05:96"
+        speed: 1gb
+        features: ''
+        name: 'nic1'
+      # eth1, Connected, trunk for all other VLANs
+      - mac_address: "e0:ff:f7:00:05:97"
+        speed: 1gb
+        features: ''
+        name: 'nic2'
+  ############################################################################
+  - name: softiron-2
+    node: *nodeparams_b
+    disks: *disks_b
+    remote_management:
+      <<: *remote_params
+      address: 10.0.16.6
+      mac_address: "E0:FF:F7:00:04:29"
+    interfaces:
+      # eth0, Connected, used only for admin/PXE
+      - mac_address: "e0:ff:f7:00:05:93"
+        speed: 1gb
+        features: ''
+        name: 'nic1'
+      # eth1, Connected, trunk for all other VLANs
+      - mac_address: "e0:ff:f7:00:05:94"
+        speed: 1gb
+        features: ''
+        name: 'nic2'
diff --git a/labs/nokia/pod1.yaml b/labs/nokia/pod1.yaml
new file mode 100644 (file)
index 0000000..037d4f9
--- /dev/null
@@ -0,0 +1,243 @@
+##############################################################################
+# Copyright (c) 2018 Nokia, 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
+##############################################################################
+---
+### Nokia POD descriptor file ###
+
+details:
+  pod_owner: Mika Rautakumpu
+  contact: opnfv-public-lab-admin@list.nokia.com
+  lab: Nokia Pharos Lab
+  location: Espoo, Finland
+  type: development
+  link: https://wiki.opnfv.org/display/pharos/Nokia+Hosting
+###########################################################
+
+jumphost:
+  name: nokiapod-jumpserver
+  node: &nodeparamscomp
+    type: baremetal
+    vendor: Intel
+    model: E5-2680
+    arch: x86_64
+    cpus: 2
+    cpu_cflags: broadwell
+    cores: 14
+    memory: 128G
+  disks: &disks
+    - name: 'disk1'
+      disk_capacity: 1TB
+      disk_type: hdd
+      disk_interface: sata
+      disk_rotation: 7200
+    - name: 'disk2'
+      disk_capacity: 1TB
+      disk_type: hdd
+      disk_interface: sata
+      disk_rotation: 7200
+  os: centos-7
+  remote_params: &remote_params
+    type: ipmi
+    versions:
+      - 1.0
+      - 2.0
+    user: admin
+    pass: admin
+  remote_management:
+    <<: *remote_params
+    address: 192.168.1.10
+    mac_address: "54:ab:3a:14:11:e9"
+  interfaces:
+    - mac_address: "90:e2:ba:b0:b6:4d"
+      speed: 10gb
+      features: 'dpdk|sriov'
+      name: 'nic1'
+    - mac_address: "90:e2:ba:b0:b6:4c"
+      speed: 10gb
+      features: 'dpdk|sriov'
+      name: 'nic2'
+    - mac_address: "54:ab:3a:09:99:06"
+      speed: 10gb
+      features: 'dpdk|sriov'
+      name: 'nic3'
+    - mac_address: "54:ab:3a:09:99:05"
+      speed: 10gb
+      features: 'dpdk|sriov'
+      name: 'nic4'
+    - mac_address: "54:ab:3a:14:11:e8"
+      speed: 10gb
+      features: 'dpdk|sriov'
+      name: 'nic5'
+    - mac_address: "54:ab:3a:14:11:e7"
+      speed: 10gb
+      features: 'dpdk|sriov'
+      name: 'nic6'
+####################################################
+nodes:
+  - name: nokiapod-node1
+    node: &nodeparams
+      type: baremetal
+      vendor: Intel
+      model: E5-2630
+      arch: x86_64
+      cpus: 2
+      cpu_cflags: haswell
+      cores: 8
+      memory: 64G
+    disks: &diskscont
+      - name: 'disk1'
+        disk_capacity: 800GB
+        disk_type: ssd
+        disk_interface: sata
+        disk_rotation: 0
+      - name: 'disk2'
+        disk_capacity: 1TB
+        disk_type: hdd
+        disk_interface: sata
+        disk_rotation: 7200
+      - name: 'disk3'
+        disk_capacity: 1TB
+        disk_type: hdd
+        disk_interface: sata
+        disk_rotation: 7200
+    remote_management:
+      <<: *remote_params
+      address: 192.168.1.20
+      mac_address: "54:ab:3a:29:18:38"
+    interfaces:
+      - mac_address: "54:ab:3a:24:3b:e2"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic3'
+      - mac_address: "54:ab:3a:24:3b:e1"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic4'
+      - mac_address: "54:ab:3a:29:18:37"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic5'
+      - mac_address: "54:ab:3a:29:18:36"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic6'
+  ####################################################
+  - name: nokiapod-node2
+    node: *nodeparams
+    disks: *diskscont
+    remote_management:
+      <<: *remote_params
+      address: 192.168.1.21
+      mac_address: "54:ab:3a:16:84:45"
+    interfaces:
+      - mac_address: "54:ab:3a:24:3f:ac"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic3'
+      - mac_address: "54:ab:3a:24:3f:ab"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic4'
+      - mac_address: "54:ab:3a:16:84:44"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic5'
+      - mac_address: "54:ab:3a:16:84:43"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic6'
+  ####################################################
+  - name: nokiapod-node3
+    node: *nodeparams
+    disks: *diskscont
+    remote_management:
+      <<: *remote_params
+      address: 192.168.1.22
+      mac_address: "54:ab:3a:16:84:6f"
+    interfaces:
+      - mac_address: "54:ab:3a:24:41:be"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic3'
+      - mac_address: "54:ab:3a:24:41:bd"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic4'
+      - mac_address: "54:ab:3a:16:84:6e"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic5'
+      - mac_address: "54:ab:3a:16:84:6d"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic6'
+  ####################################################
+  - name: nokiapod-node4
+    node: *nodeparamscomp
+    disks: *disks
+    remote_management:
+      <<: *remote_params
+      address: 192.168.1.30
+      mac_address: "54:ab:3a:13:72:9c"
+    interfaces:
+      - mac_address: "90:e2:ba:b0:f2:3d"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic1'
+      - mac_address: "90:e2:ba:b0:f2:3c"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic2'
+      - mac_address: "54:ab:3a:09:8b:84"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic3'
+      - mac_address: "54:ab:3a:09:8b:83"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic4'
+      - mac_address: "54:ab:3a:13:72:9b"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic5'
+      - mac_address: "54:ab:3a:13:72:9a"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic6'
+  ####################################################
+  - name: nokiapod-node5
+    node: *nodeparamscomp
+    disks: *disks
+    remote_management:
+      <<: *remote_params
+      address: 192.168.1.31
+      mac_address: "54:ab:3a:13:71:94"
+    interfaces:
+      - mac_address: "90:e2:ba:b0:a6:e5"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic1'
+      - mac_address: "90:e2:ba:b0:a6:e4"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic2'
+      - mac_address: "54:ab:3a:09:94:ea"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic3'
+      - mac_address: "54:ab:3a:09:94:e9"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic4'
+      - mac_address: "54:ab:3a:13:71:93"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic5'
+      - mac_address: "54:ab:3a:13:71:92"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic6'