Update the pdf/idf for ericsson pod2

Change-Id: I9b5db404cde0414f34621cf12819fd3edfcf0414
Signed-off-by: Manuel Buil <mbuil@suse.com>

diff --git a/labs/ericsson/idf-pod2.yaml b/labs/ericsson/idf-pod2.yaml
index 5e0db5a..301241b 100644 (file)
--- a/labs/ericsson/idf-pod2.yaml
+++ b/labs/ericsson/idf-pod2.yaml
@@ -6,7 +6,127 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 ---
+### ERICSSON POD 2 installer descriptor file ###
 idf:
   version: 0.1
-  # NOTE: Fuel checking is disabled until 'idf.fuel' is defined below
-  installer: ['apex', 'compass4nfv', 'daisy']
+  installer: ['apex', 'compass4nfv', 'daisy', 'osa']
+  net_config: &net_config
+    admin:
+      interface: 2
+      network: 192.168.122.0    # Untagged, 'PXE/Admin' on wiki, different IP
+      mask: 24
+    mgmt:
+      interface: 1
+      network: 172.29.236.0
+      mask: 22
+    storage:
+      interface: 3
+      network: 172.29.240.0      # Tagged, not the same with 'storage' on wiki
+      mask: 22
+    private:
+      interface: 4
+      network: 172.29.242.0      # Tagged, not the same with 'private' on wiki
+      mask: 22
+    public:
+      interface: 2
+      network: 192.168.122.0     # Untagged, 'public' on wiki
+      mask: 24
+      gateway: 192.168.122.1
+      dns:
+        - 8.8.8.8
+        - 8.8.4.4
+  osa: &idf_osa
+    nodes_roles:
+      opnfv: [deployment]
+      node1: [controller]
+      node2: [compute, storage]
+      node3: [compute, storage]
+      node4: [controller]
+      node5: [controller]
+    groups:
+      openstack:
+        - controller
+        - compute
+        - storage
+    hostnames:
+      opnfv: opnfv
+      node1: controller00
+      node2: compute00
+      node3: compute01
+      node4: controller01
+      node5: controller02
+    network:
+      # network mapping
+      network_mapping:
+        # Management network used by installer components to communicate
+        net-mgmt: admin
+        # Storage Network
+        net-storage: storage
+        # Internal network for communication between VNF
+        net-internal: private
+        # Public network for VNF remote acces (ext-net in Openstack)
+        net-vnf: public
+      deployment_host_interfaces:
+        # Ordered-list, index should be in sync with interface index in PDF
+        - 'eno49'
+        - 'ens1f0'
+        - 'ens1f1'
+        - 'ens2f0'
+        - 'ens2f1'
+  kubespray: &idf_kubespray
+    nodes_roles:
+      opnvf: [opnfv]
+      node1: [kube-master, etcd, vault]
+      node2: [kube-node]
+      node3: [kube-node]
+      node4: [kube-master, etcd, vault]
+      node5: [kube-master, etcd, vault]
+    groups:
+      k8s-cluster:
+        - kube-node
+        - kube-master
+    hostnames:
+      opnfv: opnfv
+      node1: master1
+      node2: node1
+      node3: node2
+      node4: master2
+      node5: master3
+
+
+xci:
+  pod_name: pod1
+  net_config: *net_config
+  flavors:
+    mini:
+      - opnfv
+      - node1
+      - node2
+    noha:
+      - opnfv
+      - node1
+      - node2
+      - node3
+    ha:
+      - opnfv
+      - node1
+      - node2
+      - node3
+      - node4
+      - node5
+
+  # net_config network to be used by the PXE
+  pxe_network: public
+
+  # As the MAC of generated bridges are generated, we use a list of local
+  # bridges to create libvirt networks
+  jumphost_interfaces_bridges:
+    - name: virbr0
+      ip: 192.168.122.1
+
+  extra_addresses:
+    opnfv: 192.168.122.2
+
+  installers:
+    osa: *idf_osa
+    kubespray: *idf_kubespray

diff --git a/labs/ericsson/pod2.yaml b/labs/ericsson/pod2.yaml
index c0aef2c..5131ff9 100644 (file)
--- a/labs/ericsson/pod2.yaml
+++ b/labs/ericsson/pod2.yaml
@@ -55,156 +55,232 @@ jumphost:
       SKM7gBBWbUmwjBdGX6aurCiyVGv2]
   remote_management:
     <<: *remoteparas
-    address: 172.16.2.11/24
+    address: 172.16.2.11
     mac_address: "58:20:B1:01:8A:F2"
   interfaces:
+    - name: 'nic0'
+      speed: 1gb
+      features: 'dpdk|sriov'
+      address: "192.168.122.2"
+      mac_address: "ec:b1:d7:a1:a1:10"
+      vlan: native
     - name: 'nic1'
       speed: 10gb
       features: 'dpdk|sriov'
-      address: 100.64.201.5/24
+      address: "172.29.236.10"
       mac_address: "5c:b9:01:8b:9f:e8"
-      vlan: 84
+      vlan: native
     - name: 'nic2'
       speed: 10gb
       features: 'dpdk|sriov'
-      address: 100.64.201.5/24
+      address: "192.168.122.2"
       mac_address: "5c:b9:01:8b:9f:e9"
       vlan: native
     - name: 'nic3'
       speed: 10gb
       features: 'dpdk|sriov'
-      address: 172.16.0.248/16
+      address: "172.29.240.10"
       mac_address: "5c:b9:01:8b:9f:ec"
-      vlan: native
+      vlan: 3010
     - name: 'nic4'
       speed: 10gb
       features: 'dpdk|sriov'
-      address: 172.16.0.248/16
+      address: "172.29.242.10"
       mac_address: "5c:b9:01:8b:9f:ed"
-      vlan: native
+      vlan: 3010
 ##############################################################################
 nodes:
-  - name: CI-ERICSSON-POD2-NODE1
+  - name: node1
     node: *nodeparams
     disks: *disks
     remote_management:
       <<: *remoteparas
-      address: 172.16.2.12/24
+      address: 172.16.2.12
       mac_address: "58:20:B1:01:8B:F0"
     interfaces:
+      - name: 'nic0'
+        speed: 1gb
+        features: 'dpdk|sriov'
+        mac_address: "ec:b1:d7:a2:44:a0"
+        address: "192.168.122.3"
+        vlan: native
       - name: 'nic1'
         speed: 10gb
         features: 'dpdk|sriov'
         mac_address: "5c:b9:01:8b:a6:94"
+        address: "172.29.236.11"
+        vlan: native
       - name: 'nic2'
         speed: 10gb
         features: 'dpdk|sriov'
         mac_address: "5c:b9:01:8b:a6:95"
+        address: "192.168.122.3"
+        vlan: native
       - name: 'nic3'
         speed: 10gb
         features: 'dpdk|sriov'
         mac_address: "5c:b9:01:8b:a6:80"
+        address: "172.29.240.11"
+        vlan: 3010
       - name: 'nic4'
         speed: 10gb
         features: 'dpdk|sriov'
         mac_address: "5c:b9:01:8b:a6:81"
+        address: "172.29.242.11"
+        vlan: 3010
   ############################################################################
-  - name: CI-ERICSSON-POD2-NODE2
+  - name: node2
     node: *nodeparams
     disks: *disks
     remote_management:
       <<: *remoteparas
-      address: 172.16.2.13/24
+      address: 172.16.2.13
       mac_address: "58:20:B1:01:8E:FC"
     interfaces:
+      - name: 'nic0'
+        speed: 1gb
+        features: 'dpdk|sriov'
+        mac_address: "ec:b1:d7:a2:44:80"
+        address: "192.168.122.4"
+        vlan: native
       - name: 'nic1'
         speed: 10gb
         features: 'dpdk|sriov'
         mac_address: "5c:b9:01:8b:a6:30"
+        address: "172.29.236.12"
+        vlan: native
       - name: 'nic2'
         speed: 10gb
         features: 'dpdk|sriov'
         mac_address: "5c:b9:01:8b:a6:31"
+        address: "192.168.122.4"
+        vlan: native
       - name: 'nic3'
         speed: 10gb
         features: 'dpdk|sriov'
         mac_address: "5c:b9:01:8b:99:64"
+        address: "172.29.240.12"
+        vlan: 3010
       - name: 'nic4'
         speed: 10gb
         features: 'dpdk|sriov'
-        mac_address: "5c:b9:01:8b:99:65"   # second port, no connection
+        mac_address: "5c:b9:01:8b:99:65"
+        address: "172.29.242.12"
+        vlan: 3010
   ############################################################################
-  - name: CI-ERICSSON-POD2-NODE3
+  - name: node3
     node: *nodeparams
     disks: *disks
     remote_management:
       <<: *remoteparas
-      address: 172.16.2.14/24
+      address: 172.16.2.14
       mac_address: "58:20:B1:01:8D:32"
     interfaces:
+      - name: 'nic0'
+        speed: 1gb
+        features: 'dpdk|sriov'
+        mac_address: "ec:b1:d7:a2:43:c0"
+        address: "192.168.122.5"
+        vlan: native
       - name: 'nic1'
         speed: 10gb
         features: 'dpdk|sriov'
         mac_address: "5c:b9:01:8b:9d:4c"
+        address: "172.29.236.13"
+        vlan: native
       - name: 'nic2'
         speed: 10gb
         features: 'dpdk|sriov'
         mac_address: "5c:b9:01:8b:9d:4d"
+        address: "192.168.122.5"
+        vlan: native
       - name: 'nic3'
         speed: 10gb
         features: 'dpdk|sriov'
         mac_address: "5c:b9:01:8b:9d:6c"
+        address: "172.29.240.13"
+        vlan: 3010
       - name: 'nic4'
         speed: 10gb
         features: 'dpdk|sriov'
         mac_address: "5c:b9:01:8b:9d:6d"
+        address: "172.29.242.13"
+        vlan: 3010
   ############################################################################
-  - name: CI-ERICSSON-POD2-NODE4
+  - name: node4
     node: *nodeparams
     disks: *disks
     remote_management:
       <<: *remoteparas
-      address: 172.16.2.15/24
+      address: 172.16.2.15
       mac_address: "58:20:B1:01:8B:FC"
     interfaces:
+      - name: 'nic0'
+        speed: 1gb
+        features: 'dpdk|sriov'
+        mac_address: "ec:b1:d7:a1:8b:d0"
+        address: "192.168.122.6"
+        vlan: native
       - name: 'nic1'
         speed: 10gb
         features: 'dpdk|sriov'
         mac_address: "5c:b9:01:8b:a5:fc"
+        address: "172.29.236.14"
+        vlan: native
       - name: 'nic2'
         speed: 10gb
         features: 'dpdk|sriov'
         mac_address: "5c:b9:01:8b:a5:fd"
+        address: "192.168.122.6"
+        vlan: native
       - name: 'nic3'
         speed: 10gb
         features: 'dpdk|sriov'
         mac_address: "5c:b9:01:8b:a6:08"
+        address: "172.29.240.14"
+        vlan: 3010
       - name: 'nic4'
         speed: 10gb
         features: 'dpdk|sriov'
         mac_address: "5c:b9:01:8b:a6:09"
+        address: "172.29.242.14"
+        vlan: 3010
   ############################################################################
-  - name: CI-ERICSSON-POD2-NODE5
+  - name: node5
     node: *nodeparams
     disks: *disks
     remote_management:
       <<: *remoteparas
-      address: 172.16.2.16/24
+      address: 172.16.2.16
       mac_address: "58:20:B1:01:8F:EA"
     interfaces:
+      - name: 'nic0'
+        speed: 1gb
+        features: 'dpdk|sriov'
+        mac_address: "ec:b1:d7:a1:bd:60"
+        address: "192.168.122.7"
+        vlan: native
       - name: 'nic1'
         speed: 10gb
         features: 'dpdk|sriov'
         mac_address: "5c:b9:01:8b:a6:e8"
+        address: "172.29.236.15"
+        vlan: native
       - name: 'nic2'
         speed: 10gb
         features: 'dpdk|sriov'
         mac_address: "5c:b9:01:8b:a6:e9"
+        address: "192.168.122.7"
+        vlan: native
       - name: 'nic3'
         speed: 10gb
         features: 'dpdk|sriov'
         mac_address: "5c:b9:01:8b:97:14"
+        address: "172.29.240.15"
+        vlan: 3010
       - name: 'nic4'
         speed: 10gb
         features: 'dpdk|sriov'
         mac_address: "5c:b9:01:8b:97:15"
+        address: "172.29.242.15"
+        vlan: 3010