Moving all pdfs to pharos repo 79/48279/1
authoragardner <agardner@linuxfoundation.org>
Fri, 1 Dec 2017 21:26:36 +0000 (16:26 -0500)
committeragardner <agardner@linuxfoundation.org>
Fri, 1 Dec 2017 21:28:16 +0000 (16:28 -0500)
Inline encrytion of yaml files allows us to  make away with securedlab's
restrictions. Going forward, anyone will be able to see Lab PDFs

See:
https://github.com/opnfv/pharos/blob/master/config/utils/README.eyaml.rst

If you are the reviewer on this changeset it is becasue
git blamed showed you to be the author of the pdf in this review.

Encrypting ipmi password is optional. I have scrubbed the password from
this change. If you do not need the password to be hidden, please let me
know in the comment, and I will put it back.

If you do need the password hidden, please follow the readme above and
ammend this patch to include the encrypted value that you create on your
pods jumphost.

Change-Id: I52a5c117da599fd46aa246de20077d5bdbe8a3b6
Signed-off-by: agardner <agardner@linuxfoundation.org>
labs/ericsson/idf-pod1.yaml [new file with mode: 0644]
labs/ericsson/pod1.yaml [new file with mode: 0644]
labs/ericsson/pod2.yaml [new file with mode: 0644]

diff --git a/labs/ericsson/idf-pod1.yaml b/labs/ericsson/idf-pod1.yaml
new file mode 100644 (file)
index 0000000..14f74d4
--- /dev/null
@@ -0,0 +1,46 @@
+##############################################################################
+# Copyright (c) 2017 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 1 installer descriptor file ###
+
+idf:
+  version: 0.1
+  fuel:
+    jumphost:
+      bridges:
+        admin: 'pxebr'
+        mgmt: 'br-mgmt'
+        private: ''
+        public: 'br-external'
+    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
+            - 'ens1f0'
+            - 'ens1f1'
+            - 'ens2f0'
+            - 'ens2f1'
+            - 'eno1'
+            - 'eno2'
+          busaddr: &busaddr
+            # Bus-info reported by `ethtool -i ethX`
+            - '0000:05:00.0'
+            - '0000:05:00.1'
+            - '0000:21:00.0'
+            - '0000:21:00.1'
+            - '0000:04:00.0'
+            - '0000:04:00.1'
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
diff --git a/labs/ericsson/pod1.yaml b/labs/ericsson/pod1.yaml
new file mode 100644 (file)
index 0000000..76ca002
--- /dev/null
@@ -0,0 +1,328 @@
+##############################################################################
+# Copyright (c) 2017 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
+##############################################################################
+---
+### POD descriptor file ###
+
+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-POD1
+##############################################################################
+net_config:
+  # NOTE: Network names are likely to change after the PDF spec is updated
+  # NOTE: Some networks (e.g. admin) are created by the installer
+  # NOTE: Network-to-interface mapping will be reworked after PDF update
+  oob:
+    interface: 0
+    ip-range: 172.16.1.16-172.16.1.21
+    vlan: native
+  admin:
+    interface: 4
+    vlan: native
+    network: 192.168.11.0  # Untagged, 'PXE/Admin' for MaaS (no IP on JP)
+    mask: 24
+  mgmt:
+    interface: 2
+    vlan: 81
+    network: 192.168.10.0
+    mask: 24
+  storage:
+    interface: 2
+    vlan: 82
+    network: 192.168.20.0
+    mask: 24
+  private:
+    interface: 3
+    vlan: 1000
+    network: 192.168.2.0
+    mask: 24
+  public:
+    interface: 2
+    vlan: 80
+    network: 100.64.200.0
+    mask: 24
+    gateway: 100.64.200.1
+    dns:
+      - 8.8.8.8
+      - 8.8.4.4
+##############################################################################
+jumphost:
+  name: CI-POD1-HOST
+  node: &nodeparams
+    type: baremetal
+    vendor: HP
+    model: ProLiant BL460c Gen8
+    arch: x86_64
+    cpus: 2
+    cpu_cflags: ivybridge
+    cores: 10
+    memory: 64G
+  disks: &disks
+    - name: 'disk1'
+      disk_capacity: 800G
+      disk_type: hdd
+      disk_interface: scsi
+      disk_rotation: 15000
+  os: ubuntu-16.04
+  remote_params: &remoteparas
+    type: ipmi
+    versions:
+      - 1.0
+      - 2.0
+    user:
+    pass:
+  remote_management:
+    <<: *remoteparas
+    address: 172.16.1.21/24
+    mac_address: "9C:B6:54:8E:C5:76"
+  interfaces:
+    - nic: 'nic1'
+      speed: 10gb
+      features: 'dpdk|sriov'
+      address: 100.64.200.5/24
+      mac_address: "38:ea:a7:8f:53:00"
+      vlan: 80
+    - nic: 'nic2'
+      speed: 10gb
+      features: 'dpdk|sriov'
+      address:
+      mac_address: "38:ea:a7:8f:53:01"
+      vlan: native
+    - nic: 'nic3'
+      speed: 10gb
+      features: 'dpdk|sriov'
+      address: 172.16.0.250/16
+      mac_address: "38:ea:a7:8f:06:00"
+      vlan: native
+    - nic: 'nic4'
+      speed: 10gb
+      features: 'dpdk|sriov'
+      address:
+      mac_address: "38:ea:a7:8f:06:01"
+      vlan: native
+    - nic: 'nic5'
+      speed: 10gb
+      features: 'dpdk|sriov'
+      address:
+      mac_address: "9c:b6:54:8a:05:70"
+      vlan: native
+    - nic: 'nic6'
+      speed: 10gb
+      features: 'dpdk|sriov'
+      address:
+      mac_address: "9c:b6:54:8a:05:74"
+      vlan: native
+##############################################################################
+nodes:
+  - name: CI-ERICSSON-POD1-NODE1
+    node: *nodeparams
+    disks: *disks
+    remote_management:
+      <<: *remoteparas
+      address: 172.16.1.16/24
+      mac_address: "14:58:D0:5D:AB:6A"
+    interfaces:
+      - name: 'nic1'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address:
+        mac_address: "38:ea:a7:17:6b:98"
+      - name: 'nic2'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address:
+        mac_address: "38:ea:a7:17:6b:99"
+      - name: 'nic3'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address:
+        mac_address: "38:ea:a7:17:6b:84"
+      - name: 'nic4'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address:
+        mac_address: "38:ea:a7:17:6b:85"
+      - nic: 'nic5'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address:
+        mac_address: "14:58:d0:54:e7:88"
+        vlan: native
+      - nic: 'nic6'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address:
+        mac_address: "00:00:00:00:00:00"
+        vlan: native
+  ############################################################################
+  - name: CI-ERICSSON-POD1-NODE2
+    node: *nodeparams
+    disks: *disks
+    remote_management:
+      <<: *remoteparas
+      address: 172.16.1.17/24
+      mac_address: "14:58:D0:5D:AB:4D"
+    interfaces:
+      - name: 'nic1'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address:
+        mac_address: "38:ea:a7:17:6b:7c"
+      - name: 'nic2'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address:
+        mac_address: "38:ea:a7:17:6b:7d"
+      - name: 'nic3'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address:
+        mac_address: "38:ea:a7:17:6b:6c"
+      - name: 'nic4'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address:
+        mac_address: "38:ea:a7:17:6b:6d"
+      - nic: 'nic5'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address:
+        mac_address: "14:58:d0:54:6a:60"
+        vlan: native
+      - nic: 'nic6'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address:
+        mac_address: "00:00:00:00:00:00"
+        vlan: native
+  ############################################################################
+  - name: CI-ERICSSON-POD1-NODE3
+    node: *nodeparams
+    disks: *disks
+    remote_management:
+      <<: *remoteparas
+      address: 172.16.1.18/24
+      mac_address: "14:58:D0:5D:AB:F2"
+    interfaces:
+      - name: 'nic1'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address:
+        mac_address: "38:ea:a7:17:6a:38"
+      - name: 'nic2'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address:
+        mac_address: "38:ea:a7:17:6a:39"
+      - name: 'nic3'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address:
+        mac_address: "38:ea:a7:17:6a:3c"
+      - name: 'nic4'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address:
+        mac_address: "38:ea:a7:17:6a:3d"
+      - nic: 'nic5'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address:
+        mac_address: "14:58:d0:54:7a:28"
+        vlan: native
+      - nic: 'nic6'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address:
+        mac_address: "00:00:00:00:00:00"
+        vlan: native
+  ############################################################################
+  - name: CI-ERICSSON-POD1-NODE4
+    node: *nodeparams
+    disks: *disks
+    remote_management:
+      <<: *remoteparas
+      address: 172.16.1.19/24
+      mac_address: "9C:B6:54:8E:C7:F0"
+    interfaces:
+      - name: 'nic1'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address:
+        mac_address: "38:ea:a7:8f:1f:d4"
+      - name: 'nic2'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address:
+        mac_address: "38:ea:a7:8f:1f:d5"
+      - name: 'nic3'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address:
+        mac_address: "38:ea:a7:8f:52:cc"
+      - name: 'nic4'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address:
+        mac_address: "38:ea:a7:8f:52:cd"
+      - nic: 'nic5'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address:
+        mac_address: "9c:b6:54:8a:95:a0"
+        vlan: native
+      - nic: 'nic6'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address:
+        mac_address: "00:00:00:00:00:00"
+        vlan: native
+  ############################################################################
+  - name: CI-ERICSSON-POD1-NODE5
+    node: *nodeparams
+    disks: *disks
+    remote_management:
+      <<: *remoteparas
+      address: 172.16.1.20/24
+      mac_address: "9C:B6:54:8E:C5:74"
+    interfaces:
+      - name: 'nic1'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address:
+        mac_address: "38:ea:a7:8f:07:50"
+      - name: 'nic2'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address:
+        mac_address: "38:ea:a7:8f:07:51"
+      - name: 'nic3'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address:
+        mac_address: "38:ea:a7:8f:12:48"
+      - name: 'nic4'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address:
+        mac_address: "38:ea:a7:8f:12:49"
+      - nic: 'nic5'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address:
+        mac_address: "9c:b6:54:8a:10:18"
+        vlan: native
+      - nic: 'nic6'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address:
+        mac_address: "00:00:00:00:00:00"
+        vlan: native
diff --git a/labs/ericsson/pod2.yaml b/labs/ericsson/pod2.yaml
new file mode 100644 (file)
index 0000000..c6477fa
--- /dev/null
@@ -0,0 +1,211 @@
+---
+### POD descriptor file ###
+
+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:
+    pass:
+  remote_management:
+    <<: *remoteparas
+    address: 172.16.2.11/24
+    mac_address: "58:20:B1:01:8A:F2"
+  interfaces:
+    - nic: 'nic1'
+      speed: 10gb
+      features: 'dpdk,sriov'
+      address: 100.64.201.5/24
+      mac_address: "5c:b9:01:8b:9f:e8"
+      vlan: 84
+    - nic: 'nic2'
+      speed: 10gb
+      features: 'dpdk,sriov'
+      address: 100.64.201.5/24
+      mac_address: "5c:b9:01:8b:9f:e9"
+      vlan: native
+    - nic: 'nic3'
+      speed: 10gb
+      features: 'dpdk,sriov'
+      address: 172.16.0.248/16
+      mac_address: "5c:b9:01:8b:9f:ec"
+      vlan: native
+    - nic: 'nic4'
+      speed: 10gb
+      features: 'dpdk,sriov'
+      address: 172.16.0.248/16
+      mac_address: "5c:b9:01:8b:9f:ed"
+      vlan: native
+##############################################################################
+nodes:
+  - name: CI-ERICSSON-POD2-NODE1
+    node: *nodeparams
+    disks: *disks
+    remote_management:
+      <<: *remoteparas
+      address: 172.16.2.12/24
+      mac_address: "58:20:B1:01:8B:F0"
+    interfaces:
+      - name: 'nic1'
+        speed: 10gb
+        features: 'dpdk,sriov'
+        address:
+        mac_address: "5c:b9:01:8b:a6:94"
+      - name: 'nic2'
+        speed: 10gb
+        features: 'dpdk,sriov'
+        address:
+        mac_address: "5c:b9:01:8b:a6:95"
+      - name: 'nic3'
+        speed: 10gb
+        features: 'dpdk,sriov'
+        address:
+        mac_address: "5c:b9:01:8b:a6:80"
+      - name: 'nic4'
+        speed: 10gb
+        features: 'dpdk,sriov'
+        address:
+        mac_address: "5c:b9:01:8b:a6:81"
+  ############################################################################
+  - name: CI-ERICSSON-POD2-NODE2
+    node: *nodeparams
+    disks: *disks
+    remote_management:
+      <<: *remoteparas
+      address: 172.16.2.13/24
+      mac_address: "58:20:B1:01:8E:FC"
+    interfaces:
+      - name: 'nic1'
+        speed: 10gb
+        features: 'dpdk,sriov'
+        address:
+        mac_address: "5c:b9:01:8b:a6:30"
+      - name: 'nic2'
+        speed: 10gb
+        features: 'dpdk,sriov'
+        address:
+        mac_address: "5c:b9:01:8b:a6:31"
+      - name: 'nic3'
+        speed: 10gb
+        features: 'dpdk,sriov'
+        address:
+        mac_address: "5c:b9:01:8b:99:64"
+      - name: 'nic4'
+        speed: 10gb
+        features: 'dpdk,sriov'
+        address:
+        mac_address: "5c:b9:01:8b:99:65"   # second port, no connection
+  ############################################################################
+  - name: CI-ERICSSON-POD2-NODE3
+    node: *nodeparams
+    disks: *disks
+    remote_management:
+      <<: *remoteparas
+      address: 172.16.2.14/24
+      mac_address: "58:20:B1:01:8D:32"
+    interfaces:
+      - name: 'nic1'
+        speed: 10gb
+        features: 'dpdk,sriov'
+        address:
+        mac_address: "5c:b9:01:8b:9d:4c"
+      - name: 'nic2'
+        speed: 10gb
+        features: 'dpdk,sriov'
+        address:
+        mac_address: "5c:b9:01:8b:9d:4d"
+      - name: 'nic3'
+        speed: 10gb
+        features: 'dpdk,sriov'
+        address:
+        mac_address: "5c:b9:01:8b:9d:6c"
+      - name: 'nic4'
+        speed: 10gb
+        features: 'dpdk,sriov'
+        address:
+        mac_address: "5c:b9:01:8b:9d:6d"
+  ############################################################################
+  - name: CI-ERICSSON-POD2-NODE4
+    node: *nodeparams
+    disks: *disks
+    remote_management:
+      <<: *remoteparas
+      address: 172.16.2.15/24
+      mac_address: "58:20:B1:01:8B:FC"
+    interfaces:
+      - name: 'nic1'
+        speed: 10gb
+        features: 'dpdk,sriov'
+        address:
+        mac_address: "5c:b9:01:8b:a5:fc"
+      - name: 'nic2'
+        speed: 10gb
+        features: 'dpdk,sriov'
+        address:
+        mac_address: "5c:b9:01:8b:a5:fd"
+      - name: 'nic3'
+        speed: 10gb
+        features: 'dpdk,sriov'
+        address:
+        mac_address: "5c:b9:01:8b:a6:08"
+      - name: 'nic4'
+        speed: 10gb
+        features: 'dpdk,sriov'
+        address:
+        mac_address: "5c:b9:01:8b:a6:09"
+  ############################################################################
+  - name: CI-ERICSSON-POD2-NODE5
+    node: *nodeparams
+    disks: *disks
+    remote_management:
+      <<: *remoteparas
+      address: 172.16.2.16/24
+      mac_address: "58:20:B1:01:8F:EA"
+    interfaces:
+      - name: 'nic1'
+        speed: 10gb
+        features: 'dpdk,sriov'
+        address:
+        mac_address: "5c:b9:01:8b:a6:e8"
+      - name: 'nic2'
+        speed: 10gb
+        features: 'dpdk,sriov'
+        address:
+        mac_address: "5c:b9:01:8b:a6:e9"
+      - name: 'nic3'
+        speed: 10gb
+        features: 'dpdk,sriov'
+        address:
+        mac_address: "5c:b9:01:8b:97:14"
+      - name: 'nic4'
+        speed: 10gb
+        features: 'dpdk,sriov'
+        address:
+        mac_address: "5c:b9:01:8b:97:15"