Add idf and pdf for lfpod4 75/67375/2
authorManuel Buil <mbuil@suse.com>
Mon, 25 Mar 2019 13:34:31 +0000 (14:34 +0100)
committerManuel Buil <mbuil@suse.com>
Mon, 25 Mar 2019 16:03:20 +0000 (17:03 +0100)
Change-Id: I6086d13450f95a5c901270c7d4b69a0aa127f129
Signed-off-by: Manuel Buil <mbuil@suse.com>
xci/var/lf-pod4-idf.yml [new file with mode: 0644]
xci/var/lf-pod4-pdf.yml [new file with mode: 0644]

diff --git a/xci/var/lf-pod4-idf.yml b/xci/var/lf-pod4-idf.yml
new file mode 100644 (file)
index 0000000..a5fd92f
--- /dev/null
@@ -0,0 +1,187 @@
+##############################################################################
+# Copyright (c) 2018 Linux Foundation, 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
+##############################################################################
+---
+### LF POD 4 installer descriptor file ###
+
+idf:
+  version: 0.1
+  installer: ['apex', 'compass4nfv', 'daisy', 'fuel', 'osa']
+  net_config: &net_config
+    oob:
+      interface: 0
+      ip-range: 172.30.8.83-172.30.8.88
+      vlan: 410
+      mask: 24
+    admin:
+      interface: 0
+      vlan: native
+      network: 192.168.122.0
+      gateway: 192.168.122.1
+      dns: 8.8.8.8
+      mask: 24
+    mgmt:
+      interface: 1
+      network: 172.29.236.0
+      mask: 22
+    storage:
+      interface: 3
+      network: 172.29.240.0
+      mask: 24
+    private:
+      interface: 2
+      network: 172.29.242.0
+      mask: 24
+    public:
+      interface: 4
+      network: 192.168.122.0
+      mask: 24
+      gateway: 192.168.122.1
+      dns:
+        - 8.8.8.8
+        - 8.8.4.4
+  osa: &idf_osa
+    nodes_roles:
+      opnfv: [deployment]
+      pod4-node1: [controller]
+      pod4-node2: [compute, storage]
+      pod4-node3: [compute, storage]
+      pod4-node4: [controller]
+      pod4-node5: [controller]
+    groups:
+      openstack:
+        - controller
+        - compute
+        - storage
+    hostnames:
+      opnfv: opnfv
+      pod4-node1: controller00
+      pod4-node2: compute00
+      pod4-node3: compute01
+      pod4-node4: controller01
+      pod4-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
+        - 'eno1'
+        - 'eno3.450'
+  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
+    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
+        - 'eno1'
+        - 'eno3.450'
+  fuel:
+    jumphost:
+      bridges:
+        admin: 'pxebr'
+        mgmt: 'br-ctl'
+        private: ~
+        public: ~
+    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
+            - 'eno1'
+            - 'eno3'
+            - 'eno4'
+          busaddr: &busaddr
+            # Bus-info reported by `ethtool -i ethX`
+            - '0000:04:00.0'
+            - '0000:02:00.0'
+            - '0000:02:00.1'
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
+xci:
+  pod_name: lf-pod4
+  net_config: *net_config
+  nodes_roles:
+    opnfv_host: [opnfv_host]
+    pod4-node1: [compute, storage]
+    pod4-node2: [compute, storage]
+    pod4-node3: [controller, storage]
+    pod4-node4: [controller, storage]
+    pod4-node5: [controller, storage]
+
+  # net_config network to be used by the PXE
+  pxe_network: admin
+
+  # As the MAC of generated bridges are generated, we use a list of local
+  # bridges to create libvirt networks
+  jumphost_interfaces_bridges:
+    - name: br_admin
+      ip:
+
+  extra_addresses:
+    opnfv_host: 192.168.12.2
+
+  flavors:
+    mini:
+      - opnfv
+      - pod4-node1
+      - pod4-node2
+    noha:
+      - opnfv
+      - pod4-node1
+      - pod4-node2
+      - pod4-node3
+    ha:
+      - opnfv
+      - pod4-node1
+      - pod4-node2
+      - pod4-node3
+      - pod4-node4
+      - pod4-node5
+
+  installers:
+    osa: *idf_osa
+    kubespray: *idf_kubespray
diff --git a/xci/var/lf-pod4-pdf.yml b/xci/var/lf-pod4-pdf.yml
new file mode 100644 (file)
index 0000000..9607e4d
--- /dev/null
@@ -0,0 +1,198 @@
+##############################################################################
+# Copyright (c) 2018 Linux Foundation, 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
+##############################################################################
+---
+### LF POD 4 descriptor file ###
+
+version: 1.0
+details:
+  pod_owner: Trevor Bramwell
+  contact: tbramwell@linuxfoundation.org
+  lab: Linux Foundation
+  location: Portland, Oregon, USA
+  type: development
+  link: https://wiki.opnfv.org/display/pharos/LF+POD+4
+jumphost:
+  name: pod4-jump
+  node: &nodeparams
+    type: baremetal
+    vendor: Intel Corporation
+    model: S2600WT2R
+    arch: x86_64
+    cpus: 88
+    cpu_cflags: haswell
+    cores: 22
+    memory: 62G
+  disks: &disks
+    - name: 'disk1'
+      disk_capacity: 480G
+      disk_type: ssd
+      disk_interface: sata
+      disk_rotation: 0
+  os: centos-7
+  remote_params: &remote_params
+    type: ipmi
+    versions:
+      - 2.0
+    user: admin
+    pass: octopus
+  remote_management:
+    <<: *remote_params
+    address: 172.30.8.83
+    mac_address: "a4:bf:01:01:b0:bb"
+  interfaces:
+    - name: nic1
+      speed: 1gb
+      features: 'dpdk|sriov'
+      vlan: native
+      mac_address: "a4:bf:01:01:b0:b9"
+      address: 192.168.12.1
+    - name: nic2
+      speed: 10gb
+      features: 'dpdk|sriov'
+      vlan: 450
+      mac_address: "00:1e:67:fd:9a:04"
+      address: 192.168.0.2
+    - name: nic3
+      speed: 10gb
+      features: 'dpdk|sriov'
+      vlan: 452
+      mac_address: "00:1e:67:fd:9a:04"
+      address: 192.168.2.2
+    - name: nic4
+      speed: 10gb
+      features: 'dpdk|sriov'
+      vlan: 451
+      mac_address: "00:1e:67:fd:9a:05"
+      address: 192.168.1.2
+    - name: nic5
+      speed: 10gb
+      features: 'dpdk|sriov'
+      vlan: 414
+      mac_address: "00:1e:67:fd:9a:05"
+      address: 172.30.12.83
+##############################################################################
+nodes:
+  - name: pod4-node1
+    node: *nodeparams
+    disks: *disks
+    remote_management:
+      <<: *remote_params
+      address: 172.30.8.84
+      mac_address: "a4:bf:01:01:ab:b6"
+    interfaces:
+      - mac_address: "a4:bf:01:01:ab:b4"
+        address: 192.168.122.3
+        vlan: native
+      - mac_address: "00:1e:67:fd:9b:32"
+        address: 172.29.236.11
+        vlan: 450
+      - mac_address: "00:1e:67:fd:9b:32"
+        address: 192.168.122.3
+        vlan: 452
+      - mac_address: "00:1e:67:fd:9b:33"
+        address: 172.29.240.11
+        vlan: 451
+      - mac_address: "00:1e:67:fd:9b:33"
+        address: 172.29.242.11
+        vlan: 414
+  ############################################################################
+  - name: pod4-node2
+    node: *nodeparams
+    disks: *disks
+    remote_management:
+      <<: *remote_params
+      address: 172.30.8.85
+      mac_address: "a4:bf:01:01:b6:97"
+    interfaces:
+      - mac_address: "a4:bf:01:01:b6:95"
+        address: 192.168.122.4
+        vlan: native
+      - mac_address: "00:1e:67:fd:98:e2"
+        address: 172.29.236.12
+        vlan: 450
+      - mac_address: "00:1e:67:fd:98:e2"
+        address: 192.168.122.4
+        vlan: 452
+      - mac_address: "00:1e:67:fd:98:e3"
+        address: 172.29.240.12
+        vlan: 451
+      - mac_address: "00:1e:67:fd:98:e3"
+        address: 172.29.242.12
+        vlan: 414
+  ############################################################################
+  - name: pod4-node3
+    node: *nodeparams
+    disks: *disks
+    remote_management:
+      <<: *remote_params
+      address: 172.30.8.86
+      mac_address: "a4:bf:01:01:66:fe"
+    interfaces:
+      - mac_address: "a4:bf:01:01:66:fc"
+        address: 192.168.122.5
+        vlan: native
+      - mac_address: "00:1e:67:fd:9c:c8"
+        address: 172.29.236.13
+        vlan: 450
+      - mac_address: "00:1e:67:fd:9c:c8"
+        address: 192.168.122.5
+        vlan: 452
+      - mac_address: "00:1e:67:fd:9c:c9"
+        address: 172.29.240.13
+        vlan: 451
+      - mac_address: "00:1e:67:fd:9c:c9"
+        address: 172.29.242.13
+        vlan: 414
+  ############################################################################
+  - name: pod4-node4
+    node: *nodeparams
+    disks: *disks
+    remote_management:
+      <<: *remote_params
+      address: 172.30.8.87
+      mac_address: "a4:bf:01:01:b2:f5"
+    interfaces:
+      - mac_address: "a4:bf:01:01:b2:f3"
+        address: 192.168.122.6
+        vlan: native
+      - mac_address: "00:1e:67:fd:9b:38"
+        address: 172.29.236.14
+        vlan: 450
+      - mac_address: "00:1e:67:fd:9b:38"
+        address: 192.168.122.6
+        vlan: 452
+      - mac_address: "00:1e:67:fd:9b:39"
+        address: 172.29.240.14
+        vlan: 451
+      - mac_address: "00:1e:67:fd:9b:39"
+        address: 172.29.242.14
+        vlan: 414
+  ############################################################################
+  - name: pod4-node5
+    node: *nodeparams
+    disks: *disks
+    remote_management:
+      <<: *remote_params
+      address: 172.30.8.88
+      mac_address: "a4:bf:01:01:b5:11"
+    interfaces:
+      - mac_address: "a4:bf:01:01:b5:0f"
+        address: 192.168.122.7
+        vlan: native
+      - mac_address: "00:1e:67:fd:99:40"
+        address: 172.29.236.15
+        vlan: 450
+      - mac_address: "00:1e:67:fd:99:40"
+        address: 192.168.122.7
+        vlan: 452
+      - mac_address: "00:1e:67:fd:99:41"
+        address: 172.29.240.15
+        vlan: 451
+      - mac_address: "00:1e:67:fd:99:41"
+        address: 172.29.242.14
+        vlan: 414