From 3c45b7287552d3269b637d872777c71911b0d8a5 Mon Sep 17 00:00:00 2001
From: Manuel Buil <mbuil@suse.com>
Date: Fri, 10 Aug 2018 14:15:29 +0200
Subject: Update the pdf/idf for ericsson pod2

Change-Id: I9b5db404cde0414f34621cf12819fd3edfcf0414
Signed-off-by: Manuel Buil <mbuil@suse.com>
---
 labs/ericsson/idf-pod2.yaml | 124 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 122 insertions(+), 2 deletions(-)

(limited to 'labs/ericsson/idf-pod2.yaml')

diff --git a/labs/ericsson/idf-pod2.yaml b/labs/ericsson/idf-pod2.yaml
index 5e0db5af..301241b6 100644
--- 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
-- 
cgit 1.2.3-korg