Merge "[fuel] IA: Add PXE/admin static IPs"
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Mon, 4 Jun 2018 16:53:26 +0000 (16:53 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Mon, 4 Jun 2018 16:53:26 +0000 (16:53 +0000)
14 files changed:
config/pdf/idf-pod1.schema.yaml
labs/arm/idf-pod5.yaml
labs/arm/idf-pod6.yaml
labs/arm/idf-pod7.yaml
labs/arm/idf-pod8.yaml [new file with mode: 0644]
labs/arm/idf-pod9.yaml [new file with mode: 0644]
labs/arm/pod8.yaml [new file with mode: 0644]
labs/arm/pod9.yaml [new file with mode: 0644]
labs/ericsson/idf-pod1.yaml
labs/ericsson/pod1.yaml
labs/lf/idf-pod2.yaml
labs/unh/idf-pod1.yaml [new file with mode: 0644]
labs/unh/pod1.yaml [new file with mode: 0644]
labs/zte/idf-pod1.yaml

index 49e06e6..2bb880d 100644 (file)
@@ -56,6 +56,10 @@ definitions:
         network:
           type: 'object'
           properties:
+            ntp_strata_host1:
+              type: 'string'
+            ntp_strata_host2:
+              type: 'string'
             node:
               type: 'array'
               items:
index 50db0cf..a519131 100644 (file)
@@ -60,6 +60,8 @@ idf:
       timeout_comissioning: 10
       timeout_deploying: 15
     network:
+      ntp_strata_host1: 1.se.pool.ntp.org
+      ntp_strata_host2: 0.se.pool.ntp.org
       node:
         # Ordered-list, index should be in sync with node index in PDF
         - interfaces: &interfaces
index 4d81fa0..395a7fb 100644 (file)
@@ -58,6 +58,8 @@ idf:
       timeout_comissioning: 10
       timeout_deploying: 15
     network:
+      ntp_strata_host1: 1.se.pool.ntp.org
+      ntp_strata_host2: 0.se.pool.ntp.org
       node:
         # Ordered-list, index should be in sync with node index in PDF
         - interfaces: &interfaces
index 7745cda..463a1f7 100644 (file)
@@ -60,6 +60,8 @@ idf:
       timeout_comissioning: 10
       timeout_deploying: 15
     network:
+      ntp_strata_host1: 1.se.pool.ntp.org
+      ntp_strata_host2: 0.se.pool.ntp.org
       node:
         # Ordered-list, index should be in sync with node index in PDF
         - interfaces: &interfaces_a
diff --git a/labs/arm/idf-pod8.yaml b/labs/arm/idf-pod8.yaml
new file mode 100644 (file)
index 0000000..e946484
--- /dev/null
@@ -0,0 +1,112 @@
+##############################################################################
+# 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
+##############################################################################
+---
+### ARM POD 8 installer descriptor file ###
+
+idf:
+  version: 0.1
+  installer: ['apex', 'compass4nfv', 'daisy', 'fuel']
+  net_config:
+    oob:
+      ip-range: 10.0.19.2-10.0.19.7
+      vlan: native
+    admin:
+      interface: 0
+      vlan: native
+      network: 192.168.11.0
+      mask: 24
+    mgmt:
+      interface: 1
+      vlan: 2403
+      network: 172.16.10.0
+      ip-range: 172.16.10.10-172.16.10.254  # Some IPs are in use by lab infra
+      mask: 24
+    storage:
+      interface: 1
+      vlan: 2404
+      network: 10.2.0.0
+      mask: 24
+    private:
+      interface: 2
+      vlan: 2405-2420
+      network: 10.1.0.0
+      mask: 24
+    public:
+      interface: 1
+      vlan: native
+      network: 10.0.19.0
+      ip-range: 10.0.19.100-10.0.19.253  # Some IPs are in use by lab infra
+      mask: 24
+      gateway: 10.0.19.254
+      dns:
+        - 8.8.8.8
+        - 8.8.4.4
+  fuel:
+    jumphost:
+      bridges:
+        admin: 'admin18_br0'
+        mgmt: 'mgmt18_br0'
+        private: ~
+        public: 'public18_br0'
+    maas:
+      # MaaS timeouts (in minutes)
+      timeout_comissioning: 10
+      timeout_deploying: 15
+    network:
+      node:
+        # Ordered-list, index should be in sync with node index in PDF
+        - interfaces: &interfaces
+            # Ordered-list, index should be in sync with interface index in PDF
+            - 'enP5p144s0'
+            - 'enP2p1s0f1'
+            - 'enP2p1s0f2'
+            - 'enP2p1s0f3'
+            - 'enP2p1s0f4'
+            - 'enP2p1s0f5'
+          busaddr: &busaddr
+            # Bus-info reported by `ethtool -i ethX`
+            - '0005:90:00.0'
+            - '0002:01:00.1'
+            - '0002:01:00.2'
+            - '0002:01:00.3'
+            - '0002:01:00.4'
+            - '0002:01:00.5'
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
+    reclass:
+      node:
+        - compute_params: &compute_params
+            common:
+              nova_cpu_pinning: &nova_cpu_pinning_common "8-47"
+              compute_hugepages_size: 2M
+              compute_hugepages_count: 8192
+              compute_hugepages_mount: /mnt/hugepages_2M
+              compute_kernel_isolcpu: *nova_cpu_pinning_common
+            dpdk:
+              nova_cpu_pinning: "12-47"
+              compute_hugepages_size: 2M
+              compute_hugepages_count: 8192
+              compute_hugepages_mount: /mnt/hugepages_2M
+              compute_kernel_isolcpu: *nova_cpu_pinning_common
+              compute_dpdk_driver: vfio
+              compute_ovs_pmd_cpu_mask: "0x300"
+              compute_ovs_dpdk_socket_mem: "2048"
+              compute_ovs_dpdk_lcore_mask: "0xC00"
+              compute_ovs_memory_channels: "2"
+              dpdk0_driver: vfio-pci
+              dpdk0_n_rxq: 2
+        - compute_params: *compute_params
+        - compute_params: *compute_params
+        - compute_params: *compute_params
+        - compute_params: *compute_params
diff --git a/labs/arm/idf-pod9.yaml b/labs/arm/idf-pod9.yaml
new file mode 100644 (file)
index 0000000..3b93079
--- /dev/null
@@ -0,0 +1,116 @@
+##############################################################################
+# 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
+##############################################################################
+---
+### ARM POD 9 installer descriptor file ###
+
+idf:
+  version: 0.1
+  installer: ['apex', 'compass4nfv', 'daisy', 'fuel']
+  net_config:
+    oob:
+      ip-range: 10.0.20.2-10.0.20.7
+      vlan: native
+    admin:
+      interface: 0
+      vlan: native
+      network: 192.168.11.0
+      mask: 24
+    mgmt:
+      interface: 1
+      vlan: 2423
+      network: 172.16.10.0
+      ip-range: 172.16.10.10-172.16.10.254  # Some IPs are in use by lab infra
+      mask: 24
+    storage:
+      interface: 1
+      vlan: 2424
+      network: 10.2.0.0
+      mask: 24
+    private:
+      interface: 2
+      vlan: 2425-2440
+      network: 10.1.0.0
+      mask: 24
+    public:
+      interface: 1
+      vlan: native
+      network: 10.0.20.0
+      ip-range: 10.0.20.100-10.0.20.253  # Some IPs are in use by lab infra
+      mask: 24
+      gateway: 10.0.20.254
+      dns:
+        - 8.8.8.8
+        - 8.8.4.4
+  fuel:
+    jumphost:
+      bridges:
+        admin: 'admin19_br0'
+        mgmt: 'mgmt19_br0'
+        private: ~
+        public: 'public19_br0'
+    maas:
+      # MaaS timeouts (in minutes)
+      timeout_comissioning: 10
+      timeout_deploying: 18
+    network:
+      node:
+        # Ordered-list, index should be in sync with node index in PDF
+        - interfaces: &interfaces
+            # Ordered-list, index should be in sync with interface index in PDF
+            - 'enP9p144s0'
+            - 'enP2p1s0f1'
+            - 'enP2p1s0f2'
+            - 'enP2p1s0f3'
+            - 'enP2p1s0f4'
+            - 'enP2p1s0f5'
+            - 'enP6p1s0f1'
+            - 'enP6p1s0f2'
+          busaddr: &busaddr
+            # Bus-info reported by `ethtool -i ethX`
+            - '0009:90:00.0'
+            - '0002:01:00.1'
+            - '0002:01:00.2'
+            - '0002:01:00.3'
+            - '0002:01:00.4'
+            - '0002:01:00.5'
+            - '0006:01:00.1'
+            - '0006:01:00.2'
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
+    reclass:
+      node:
+        - compute_params: &compute_params
+            common:
+              nova_cpu_pinning: &nova_cpu_pinning_common "8-47"
+              compute_hugepages_size: 2M
+              compute_hugepages_count: 8192
+              compute_hugepages_mount: /mnt/hugepages_2M
+              compute_kernel_isolcpu: *nova_cpu_pinning_common
+            dpdk:
+              nova_cpu_pinning: "12-47"
+              compute_hugepages_size: 2M
+              compute_hugepages_count: 8192
+              compute_hugepages_mount: /mnt/hugepages_2M
+              compute_kernel_isolcpu: *nova_cpu_pinning_common
+              compute_dpdk_driver: vfio
+              compute_ovs_pmd_cpu_mask: "0x300"
+              compute_ovs_dpdk_socket_mem: "2048"
+              compute_ovs_dpdk_lcore_mask: "0xC00"
+              compute_ovs_memory_channels: "2"
+              dpdk0_driver: vfio-pci
+              dpdk0_n_rxq: 2
+        - compute_params: *compute_params
+        - compute_params: *compute_params
+        - compute_params: *compute_params
+        - compute_params: *compute_params
diff --git a/labs/arm/pod8.yaml b/labs/arm/pod8.yaml
new file mode 100644 (file)
index 0000000..00386d5
--- /dev/null
@@ -0,0 +1,263 @@
+##############################################################################
+# 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 8 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-pod8
+  node:
+    type: baremetal
+    vendor: Cavium
+    model: ThunderX
+    arch: aarch64
+    cpus: 1
+    cpu_cflags: fp asimd evtstrm aes pmull sha1 sha2 crc32
+    cores: 48
+    memory: 256G
+  disks:
+    ## /dev/sda
+    - name: disk1
+      disk_capacity: 480G
+      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
+  os: ubuntu-16.04
+  remote_params: &remote_params
+    type: ipmi
+    versions:
+      - 2.0
+    user: ADMIN
+    pass: ADMIN
+  remote_management:
+    <<: *remote_params
+    address: 10.0.19.2
+    mac_address: "1C:1B:0D:E7:49:E7"
+  interfaces:
+    - mac_address: "68:05:CA:62:44:BE"
+      speed: 1gb
+      features: ''
+      name: 'nic1'
+    - mac_address: "1C:1B:0D:E7:49:DF"
+      speed: 10gb
+      features: 'dpdk|sriov'
+      name: 'nic2'
+    - mac_address: "1C:1B:0D:E7:49:E0"
+      speed: 10gb
+      features: 'dpdk|sriov'
+      name: 'nic3'
+    - mac_address: "1C:1B:0D:E7:49:E1"
+      speed: 10gb
+      features: 'dpdk|sriov'
+      name: 'nic4'
+    - mac_address: "1C:1B:0D:E7:49:E2"
+      speed: 10gb
+      features: 'dpdk|sriov'
+      name: 'nic5'
+    - mac_address: "1C:1B:0D:E7:49:E3"
+      speed: 40gb
+      features: 'dpdk|sriov'
+      name: 'nic6'
+##############################################################################
+nodes:
+  - name: cn8890-35
+    node: &nodeparams
+      type: baremetal
+      vendor: Cavium
+      model: ThunderX
+      arch: aarch64
+      cpus: 1
+      cpu_cflags: fp asimd evtstrm aes pmull sha1 sha2 crc32
+      cores: 48
+      memory: 256G
+    disks: &disks
+      - name: disk1
+        disk_capacity: 480G
+        disk_type: ssd
+        disk_interface: sata
+        disk_rotation: 0
+      - name: disk2
+        disk_capacity: 2T
+        disk_type: hdd
+        disk_interface: sata
+        disk_rotation: 7200
+    remote_management:
+      <<: *remote_params
+      address: 10.0.19.3
+      mac_address: "1C:1B:0D:E8:FB:7B"
+    interfaces:
+      - mac_address: "68:05:CA:7B:3A:36"
+        speed: 1gb
+        features: ''
+        name: 'nic1'
+      - mac_address: "1C:1B:0D:E8:FB:73"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic2'
+      - mac_address: "1C:1B:0D:E8:FB:74"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic3'
+      - mac_address: "1C:1B:0D:E8:FB:75"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic4'
+      - mac_address: "1C:1B:0D:E8:FB:76"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic5'
+      - mac_address: "1C:1B:0D:E8:FB:77"
+        speed: 40gb
+        features: 'dpdk|sriov'
+        name: 'nic6'
+  ############################################################################
+  - name: cn8890-36
+    node: *nodeparams
+    disks: *disks
+    remote_management:
+      <<: *remote_params
+      address: 10.0.19.4
+      mac_address: "1C:1B:0D:EF:75:6A"
+    interfaces:
+      - mac_address: "68:05:CA:7B:3A:D5"
+        speed: 1gb
+        features: ''
+        name: 'nic1'
+      - mac_address: "1C:1B:0D:EF:75:62"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic2'
+      - mac_address: "1C:1B:0D:EF:75:63"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic3'
+      - mac_address: "1C:1B:0D:EF:75:64"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic4'
+      - mac_address: "1C:1B:0D:EF:75:65"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic5'
+      - mac_address: "1C:1B:0D:EF:75:66"
+        speed: 40gb
+        features: 'dpdk|sriov'
+        name: 'nic6'
+  ############################################################################
+  - name: cn8890-37
+    node: *nodeparams
+    disks: *disks
+    remote_management:
+      <<: *remote_params
+      address: 10.0.19.5
+      mac_address: "1C:1B:0D:EF:74:DE"
+    interfaces:
+      - mac_address: "68:05:CA:62:44:96"
+        speed: 1gb
+        features: ''
+        name: 'nic1'
+      - mac_address: "1C:1B:0D:EF:74:D6"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic2'
+      - mac_address: "1C:1B:0D:EF:74:D7"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic3'
+      - mac_address: "1C:1B:0D:EF:74:D8"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic4'
+      - mac_address: "1C:1B:0D:EF:74:D9"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic5'
+      - mac_address: "1C:1B:0D:EF:74:DA"
+        speed: 40gb
+        features: 'dpdk|sriov'
+        name: 'nic6'
+  ############################################################################
+  - name: cn8890-38
+    node: *nodeparams
+    disks: *disks
+    remote_management:
+      <<: *remote_params
+      address: 10.0.19.6
+      mac_address: "1C:1B:0D:EF:74:CA"
+    interfaces:
+      - mac_address: "68:05:CA:62:44:FB"
+        speed: 1gb
+        features: ''
+        name: 'nic1'
+      - mac_address: "1C:1B:0D:EF:74:C2"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic2'
+      - mac_address: "1C:1B:0D:EF:74:C3"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic3'
+      - mac_address: "1C:1B:0D:EF:74:C4"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic4'
+      - mac_address: "1C:1B:0D:EF:74:C5"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic5'
+      - mac_address: "1C:1B:0D:EF:74:C6"
+        speed: 40gb
+        features: 'dpdk|sriov'
+        name: 'nic6'
+  ############################################################################
+  - name: cn8890-39
+    node: *nodeparams
+    disks: *disks
+    remote_management:
+      <<: *remote_params
+      address: 10.0.19.7
+      mac_address: "1C:1B:0D:EF:74:8E"
+    interfaces:
+      - mac_address: "68:05:CA:62:44:56"
+        speed: 1gb
+        features: ''
+        name: 'nic1'
+      - mac_address: "1C:1B:0D:EF:74:86"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic2'
+      - mac_address: "1C:1B:0D:EF:74:87"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic3'
+      - mac_address: "1C:1B:0D:EF:74:88"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic4'
+      - mac_address: "1C:1B:0D:EF:74:89"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic5'
+      - mac_address: "1C:1B:0D:EF:74:8A"
+        speed: 40gb
+        features: 'dpdk|sriov'
+        name: 'nic6'
diff --git a/labs/arm/pod9.yaml b/labs/arm/pod9.yaml
new file mode 100644 (file)
index 0000000..3669a34
--- /dev/null
@@ -0,0 +1,311 @@
+##############################################################################
+# 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 9 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-pod8
+  node:
+    type: baremetal
+    vendor: Cavium
+    model: ThunderX
+    arch: aarch64
+    cpus: 2
+    cpu_cflags: fp asimd evtstrm aes pmull sha1 sha2 crc32
+    cores: 48
+    memory: 256G
+  disks:
+    ## /dev/sda
+    - name: disk1
+      disk_capacity: 480G
+      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
+  os: ubuntu-16.04
+  remote_params: &remote_params
+    type: ipmi
+    versions:
+      - 2.0
+    user: ADMIN
+    pass: ADMIN
+  remote_management:
+    <<: *remote_params
+    address: 10.0.20.2
+    mac_address: "1C:1B:0D:60:EB:F3"
+  interfaces:
+    - mac_address: "68:05:CA:7B:0B:BD"
+      speed: 1gb
+      features: ''
+      name: 'nic1'
+    - mac_address: "1C:1B:0D:60:EB:EC"
+      speed: 10gb
+      features: 'dpdk|sriov'
+      name: 'nic2'
+    - mac_address: "1C:1B:0D:60:EB:ED"
+      speed: 10gb
+      features: 'dpdk|sriov'
+      name: 'nic3'
+    - mac_address: "1C:1B:0D:60:EB:EE"
+      speed: 10gb
+      features: 'dpdk|sriov'
+      name: 'nic4'
+    - mac_address: "1C:1B:0D:60:EB:EF"
+      speed: 10gb
+      features: 'dpdk|sriov'
+      name: 'nic5'
+    - mac_address: "1C:1B:0D:60:EB:F0"
+      speed: 40gb
+      features: 'dpdk|sriov'
+      name: 'nic6'
+    - mac_address: "1C:1B:0D:60:EB:F1"
+      speed: 40gb
+      features: 'dpdk|sriov'
+      name: 'nic7'
+    - mac_address: "1C:1B:0D:60:EB:F2"
+      speed: 40gb
+      features: 'dpdk|sriov'
+      name: 'nic8'
+##############################################################################
+nodes:
+  - name: cn8890-41
+    node: &nodeparams
+      type: baremetal
+      vendor: Cavium
+      model: ThunderX
+      arch: aarch64
+      cpus: 2
+      cpu_cflags: fp asimd evtstrm aes pmull sha1 sha2 crc32
+      cores: 48
+      memory: 256G
+    disks: &disks
+      - name: disk1
+        disk_capacity: 480G
+        disk_type: ssd
+        disk_interface: sata
+        disk_rotation: 0
+      - name: disk2
+        disk_capacity: 2T
+        disk_type: hdd
+        disk_interface: sata
+        disk_rotation: 7200
+    remote_management:
+      <<: *remote_params
+      address: 10.0.20.3
+      mac_address: "40:8D:5C:E7:B1:FD"
+    interfaces:
+      - mac_address: "68:05:CA:7B:3B:F5"
+        speed: 1gb
+        features: ''
+        name: 'nic1'
+      - mac_address: "40:8D:5C:E7:B1:F6"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic2'
+      - mac_address: "40:8D:5C:E7:B1:F7"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic3'
+      - mac_address: "40:8D:5C:E7:B1:F8"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic4'
+      - mac_address: "40:8D:5C:E7:B1:F9"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic5'
+      - mac_address: "40:8D:5C:E7:B1:FA"
+        speed: 40gb
+        features: 'dpdk|sriov'
+        name: 'nic6'
+      - mac_address: "40:8D:5C:E7:B1:FB"
+        speed: 40gb
+        features: 'dpdk|sriov'
+        name: 'nic7'
+      - mac_address: "40:8D:5C:E7:B1:FC"
+        speed: 40gb
+        features: 'dpdk|sriov'
+        name: 'nic8'
+  ############################################################################
+  - name: cn8890-42
+    node: *nodeparams
+    disks: *disks
+    remote_management:
+      <<: *remote_params
+      address: 10.0.20.4
+      mac_address: "40:8D:5C:E7:B3:17"
+    interfaces:
+      - mac_address: "68:05:CA:7B:3C:4D"
+        speed: 1gb
+        features: ''
+        name: 'nic1'
+      - mac_address: "40:8D:5C:E7:B3:10"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic2'
+      - mac_address: "40:8D:5C:E7:B3:11"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic3'
+      - mac_address: "40:8D:5C:E7:B3:12"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic4'
+      - mac_address: "40:8D:5C:E7:B3:13"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic5'
+      - mac_address: "40:8D:5C:E7:B3:14"
+        speed: 40gb
+        features: 'dpdk|sriov'
+        name: 'nic6'
+      - mac_address: "40:8D:5C:E7:B3:15"
+        speed: 40gb
+        features: 'dpdk|sriov'
+        name: 'nic7'
+      - mac_address: "40:8D:5C:E7:B3:16"
+        speed: 40gb
+        features: 'dpdk|sriov'
+        name: 'nic8'
+  ############################################################################
+  - name: cn8890-43
+    node: *nodeparams
+    disks: *disks
+    remote_management:
+      <<: *remote_params
+      address: 10.0.20.5
+      mac_address: "40:8D:5C:E7:B2:AB"
+    interfaces:
+      - mac_address: "68:05:CA:7B:0B:C0"
+        speed: 1gb
+        features: ''
+        name: 'nic1'
+      - mac_address: "40:8D:5C:E7:B2:A4"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic2'
+      - mac_address: "40:8D:5C:E7:B2:A5"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic3'
+      - mac_address: "40:8D:5C:E7:B2:A6"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic4'
+      - mac_address: "40:8D:5C:E7:B2:A7"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic5'
+      - mac_address: "40:8D:5C:E7:B2:A8"
+        speed: 40gb
+        features: 'dpdk|sriov'
+        name: 'nic6'
+      - mac_address: "40:8D:5C:E7:B2:A9"
+        speed: 40gb
+        features: 'dpdk|sriov'
+        name: 'nic7'
+      - mac_address: "40:8D:5C:E7:B2:AA"
+        speed: 40gb
+        features: 'dpdk|sriov'
+        name: 'nic8'
+  ############################################################################
+  - name: cn8890-44
+    node: *nodeparams
+    disks: *disks
+    remote_management:
+      <<: *remote_params
+      address: 10.0.20.6
+      mac_address: "1C:1B:0D:60:EC:17"
+    interfaces:
+      - mac_address: "68:05:CA:7B:0D:A5"
+        speed: 1gb
+        features: ''
+        name: 'nic1'
+      - mac_address: "1C:1B:0D:60:EC:10"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic2'
+      - mac_address: "1C:1B:0D:60:EC:11"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic3'
+      - mac_address: "1C:1B:0D:60:EC:12"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic4'
+      - mac_address: "1C:1B:0D:60:EC:13"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic5'
+      - mac_address: "1C:1B:0D:60:EC:14"
+        speed: 40gb
+        features: 'dpdk|sriov'
+        name: 'nic6'
+      - mac_address: "1C:1B:0D:60:EC:15"
+        speed: 40gb
+        features: 'dpdk|sriov'
+        name: 'nic7'
+      - mac_address: "1C:1B:0D:60:EC:16"
+        speed: 40gb
+        features: 'dpdk|sriov'
+        name: 'nic8'
+  ############################################################################
+  - name: cn8890-45
+    node: *nodeparams
+    disks: *disks
+    remote_management:
+      <<: *remote_params
+      address: 10.0.20.7
+      mac_address: "40:8D:5C:E7:B3:20"
+    interfaces:
+      - mac_address: "68:05:CA:7B:3C:90"
+        speed: 1gb
+        features: ''
+        name: 'nic1'
+      - mac_address: "40:8D:5C:E7:B3:19"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic2'
+      - mac_address: "40:8D:5C:E7:B3:1A"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic3'
+      - mac_address: "40:8D:5C:E7:B3:1B"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic4'
+      - mac_address: "40:8D:5C:E7:B3:1C"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic5'
+      - mac_address: "40:8D:5C:E7:B3:1D"
+        speed: 40gb
+        features: 'dpdk|sriov'
+        name: 'nic6'
+      - mac_address: "40:8D:5C:E7:B3:1E"
+        speed: 40gb
+        features: 'dpdk|sriov'
+        name: 'nic7'
+      - mac_address: "40:8D:5C:E7:B3:1F"
+        speed: 40gb
+        features: 'dpdk|sriov'
+        name: 'nic8'
index 91227d6..26dd4f6 100644 (file)
@@ -55,6 +55,8 @@ idf:
         private: ~
         public: 'br-external'
     network:
+      ntp_strata_host1: 1.se.pool.ntp.org
+      ntp_strata_host2: 0.se.pool.ntp.org
       node:
         # Ordered-list, index should be in sync with node index in PDF
         - interfaces: &interfaces
index d8a5155..5059eab 100644 (file)
@@ -210,7 +210,7 @@ nodes:
     remote_management:
       <<: *remoteparas
       address: 172.16.1.19/24
-      mac_address: "9C:B6:54:8E:C7:F0"
+      mac_address: "FC:15:B4:12:97:64"
     interfaces:
       - name: 'nic1'
         speed: 10gb
index f2ccef8..15f81e6 100644 (file)
@@ -56,6 +56,8 @@ idf:
         private: ~
         public: ~
     network:
+      ntp_strata_host1: 1.pool.ntp.org
+      ntp_strata_host2: 0.pool.ntp.org
       node:
         # Ordered-list, index should be in sync with node index in PDF
         - interfaces: &interfaces
diff --git a/labs/unh/idf-pod1.yaml b/labs/unh/idf-pod1.yaml
new file mode 100644 (file)
index 0000000..c22e037
--- /dev/null
@@ -0,0 +1,82 @@
+##############################################################################
+# 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
+##############################################################################
+---
+### UNH ARM POD installer descriptor file ###
+
+idf:
+  version: 0.1
+  installer: ['apex', 'compass4nfv', 'daisy', 'fuel']
+  net_config:
+    oob:
+      ip-range: 10.10.52.10-10.10.52.15
+      vlan: native
+    admin:
+      interface: 0
+      vlan: native
+      network: 10.10.53.0
+      mask: 24
+    mgmt:
+      interface: 0
+      vlan: 55
+      network: 172.16.10.0
+      mask: 24
+    storage:
+      interface: 0
+      vlan: 56
+      network: 10.2.0.0
+      mask: 24
+    private:
+      interface: 0
+      vlan: 57
+      network: 10.1.0.0
+      mask: 24
+    public:
+      interface: 0
+      vlan: 50
+      network: 10.10.50.0
+      mask: 24
+      gateway: 10.10.50.1
+      dns:
+        - 8.8.8.8
+        - 8.8.4.4
+  fuel:
+    jumphost:
+      bridges:
+        admin: 'admin1_br0'
+        mgmt: 'mgmt1_br0'
+        private: ''
+        public: 'public1_br0'
+    maas:
+      # MaaS timeouts (in minutes)
+      timeout_comissioning: 10
+      timeout_deploying: 15
+    network:
+      node:
+        # Ordered list, index should be in sync with node index in PDF
+        - interfaces: &interfaces
+            # Ordered-list
+            - 'enP2p1s0f1'
+            - 'enP2p1s0f2'
+            - 'enP2p1s0f3'
+            - 'enP2p1s0f4'
+            - 'enP2p1s0f5'
+          busaddr: &busaddr
+            # Bus-info reported by `ethtool -i ethX`
+            - '0002:01:00.1'
+            - '0002:01:00.2'
+            - '0002:01:00.3'
+            - '0002:01:00.4'
+            - '0002:01:00.5'
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
diff --git a/labs/unh/pod1.yaml b/labs/unh/pod1.yaml
new file mode 100644 (file)
index 0000000..0932b58
--- /dev/null
@@ -0,0 +1,268 @@
+##############################################################################
+# 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
+##############################################################################
+---
+### UNH ARM POD 1 descriptor file ###
+
+version: 1.0
+details:
+  pod_owner: University of New Hampshire
+  contact: lincoln.lavoie@iol.unh.edu
+  lab: UNH lab
+  location: New Hampshire, USA
+  type: development
+  link: https://wiki.opnfv.org/pages/viewpage.action?pageId=12389095
+#############################################
+jumphost:
+  name: jump-unh-pod1
+  node:
+    type: baremetal
+    vendor: cavium
+    model: thunderx
+    arch: aarch64
+    cpus: 1
+    cpu_cflags: fp asimd evtstrm aes pmull sha1 sha2 crc32
+    cores: 48
+    memory: 64G
+  disks:
+    ## /dev/sda
+    - name: disk1
+      disk_capacity: 447G
+      disk_type: ssd
+      disk_interface: sata
+      disk_rotation: 0
+  os: ubuntu-16.04
+  remote_params: &remote_params
+    type: ipmi
+    versions:
+      - 2.0
+    user: admin
+    pass: password
+  remote_management:
+    <<: *remote_params
+    address: 10.10.52.12
+    mac_address: "1c:1b:0d:e8:fb:8f"
+  interfaces:
+    ## enp2p1s0f1, not connected for now
+    - mac_address: "1c:1b:0d:e8:fb:87"
+      features: ''
+      name: 'nic1'
+    ## enp2p1s0f2, not connected for now
+    - mac_address: "1c:1b:0d:e8:fb:88"
+      speed: 10gb
+      features: ''
+      name: 'nic2'
+    ## enp2p1s0f3, not connected for now
+    - mac_address: "1c:1b:0d:e8:fb:89"
+      speed: 10gb
+      features: ''
+      name: 'nic3'
+    ## enp2p1s0f4, not connected for now
+    - mac_address: "1c:1b:0d:e8:fb:8a"
+      speed: 10gb
+      features: ''
+      name: 'nic4'
+    ## enp2p1s0f5, not connected for now
+    - mac_address: "1c:1b:0d:e8:fb:8b"
+      speed: 10gb
+      features: ''
+      name: 'nic5'
+##########################################
+nodes:
+  - name: small-cavium-2
+    node: &nodeparams
+      type: baremetal
+      vendor: cavium
+      model: thunderx
+      arch: aarch64
+      cpus: 1
+      cpu_cflags: fp asimd evtstrm aes pmull sha1 sha2 crc32
+      cores: 48
+      memory: 64G
+    disks: &disks
+      - name: 'disk1'
+        disk_capacity: 447G
+        disk_type: ssd
+        disk_interface: sata
+        disk_rotation: 0
+    remote_management:
+      <<: *remote_params
+      address: 10.10.52.13
+      mac_address: "1c:1b:0d:e7:49:f1"
+    interfaces:
+      ## enp2p1s0f1
+      - mac_address: "1c:1b:0d:e7:49:e9"
+        speed: 10gb
+        features: ''
+        name: 'nic1'
+      ## enp2p1s0f2
+      - mac_address: "1c:1b:0d:e7:49:ea"
+        speed: 10gb
+        features: ''
+        name: 'nic2'
+      ## enp2p1s0f3
+      - mac_address: "1c:1b:0d:e7:49:eb"
+        features: ''
+        name: 'nic3'
+      ## enp2p1s0f4
+      - mac_address: "1c:1b:0d:e7:49:ec"
+        features: ''
+        name: 'nic4'
+      ## enp2p1s0f5
+      - mac_address: "1c:1b:0d:e7:49:ed"
+        features: ''
+        name: 'nic5'
+  ##########################################
+  - name: small-cavium-3
+    node: *nodeparams
+    disks: *disks
+    remote_management:
+      <<: *remote_params
+      address: 10.10.52.14
+      mac_address: "1c:1b:0d:e8:fb:2b"
+    interfaces:
+      ## enp2p1s0f1
+      - mac_address: "1c:1b:0d:e8:fb:23"
+        speed: 10gb
+        features: ''
+        name: 'nic1'
+      ## enp2p1s0f2
+      - mac_address: "1c:1b:0d:e8:fb:24"
+        speed: 10gb
+        features: ''
+        name: 'nic2'
+      ## enp2p1s0f3
+      - mac_address: "1c:1b:0d:e8:fb:25"
+        features: ''
+        name: 'nic3'
+      ## enp2p1s0f4
+      - mac_address: "1c:1b:0d:e8:fb:26"
+        features: ''
+        name: 'nic4'
+      ## enp2p1s0f5
+      - mac_address: "1c:1b:0d:e8:fb:27"
+        features: ''
+        name: 'nic5'
+  ##########################################
+  - name: small-cavium-4
+    node: *nodeparams
+    disks: *disks
+    remote_management:
+      <<: *remote_params
+      address: 10.10.52.15
+      mac_address: "1c:1b:0d:e8:fb:99"
+    interfaces:
+      ## enp2p1s0f1
+      - mac_address: "1c:1b:0d:e8:fb:91"
+        speed: 10gb
+        features: ''
+        name: 'nic1'
+      ## enp2p1s0f2
+      - mac_address: "1c:1b:0d:e8:fb:92"
+        speed: 10gb
+        features: ''
+        name: 'nic2'
+      ## enp2p1s0f3
+      - mac_address: "1c:1b:0d:e8:fb:93"
+        features: ''
+        name: 'nic3'
+      ## enp2p1s0f4
+      - mac_address: "1c:1b:0d:e8:fb:94"
+        features: ''
+        name: 'nic4'
+      ## enp2p1s0f5
+      - mac_address: "1c:1b:0d:e8:fb:95"
+        features: ''
+        name: 'nic5'
+  #################################################
+  - name: big-cavium-1
+    node: &bignodeparams
+      type: baremetal
+      vendor: cavium
+      model: thunderx
+      arch: aarch64
+      cpus: 2
+      cpu_cflags: fp asimd evtstrm aes pmull sha1 sha2 crc32
+      cores: 96
+      memory: 128G
+    disks: *disks
+    remote_management:
+      <<: *remote_params
+      address: 10.10.52.10
+      mac_address: "40:8d:5c:e0:9f:cb"
+    interfaces:
+      ## enp2p1s0f1
+      - mac_address: "40:8d:5c:e0:9f:c4"
+        speed: 10gb
+        features: ''
+        name: 'nic1'
+      ## enp6p1s0f1
+      - mac_address: "40:8d:5c:e0:9f:c9"
+        speed: 40gb
+        features: ''
+        name: 'nic2'
+      ## enp2p1s0f2
+      - mac_address: "40:8d:5c:e0:9f:c5"
+        features: ''
+        name: 'nic3'
+      ## enp2p1s0f3
+      - mac_address: "40:8d:5c:e0:9f:c6"
+        features: ''
+        name: 'nic4'
+      ## enp2p1s0f4
+      - mac_address: "40:8d:5c:e0:9f:c7"
+        features: ''
+        name: 'nic5'
+      ## enp2p1s0f5
+      - mac_address: "40:8d:5c:e0:9f:c8"
+        speed: 40gb
+        features: ''
+        name: 'nic6'
+      ## enp6p1s0f2
+      - mac_address: "40:8d:5c:e0:9f:ca"
+        features: ''
+        name: 'nic7'
+  ##########################################
+  - name: big-cavium-2
+    node: *bignodeparams
+    disks: *disks
+    remote_management:
+      <<: *remote_params
+      address: 10.10.52.11
+      mac_address: "40:8d:5c:e0:9f:e6"
+    interfaces:
+      ## enp2p1s0f1
+      - mac_address: "40:8d:5c:e0:9f:df"
+        speed: 10gb
+        features: ''
+        name: 'nic1'
+      ## enp6p1s0f1
+      - mac_address: "40:8d:5c:e0:9f:e4"
+        speed: 40gb
+        features: ''
+        name: 'nic2'
+      ## enp2p1s0f2
+      - mac_address: "40:8d:5c:e0:9f:e0"
+        features: ''
+        name: 'nic3'
+      ## enp2p1s0f3
+      - mac_address: "40:8d:5c:e0:9f:e1"
+        features: ''
+        name: 'nic4'
+      ## enp2p1s0f4
+      - mac_address: "40:8d:5c:e0:9f:e2"
+        features: ''
+        name: 'nic5'
+      ## enp2p1s0f5
+      - mac_address: "40:8d:5c:e0:9f:e3"
+        speed: 40gb
+        features: ''
+        name: 'nic6'
+      ## enp6p1s0f2
+      - mac_address: "40:8d:5c:e0:9f:e5"
+        features: ''
+        name: 'nic7'
index 8a174c2..fd05e66 100644 (file)
@@ -52,6 +52,8 @@ idf:
         private: ~
         public: 'br-external'
     network:
+      ntp_strata_host1: 1.pool.ntp.org
+      ntp_strata_host2: 0.pool.ntp.org
       node:
         # Ordered-list, index should be in sync with node index in PDF
         - interfaces: &interfaces