xci: idf: Add more information for installers and flavors

Each installer has its own Ansible groups so we need record such
information separately. Moreover, we need to add 'flavor' information
to the IDF so we know which hosts belong to what flavor. This also
fixes the kubernetes installer type to be 'kubespray' instead of 'k8s'
Finally, we extend the IDF to also set appropriate hostnames for the
nodes.

Change-Id: I52b20908ad927840e0b38fba96be8faf6da2b52d
Signed-off-by: Markos Chandras <mchandras@suse.de>

diff --git a/xci/var/idf.yml b/xci/var/idf.yml
index 8d9352b..148508d 100644 (file)
--- a/xci/var/idf.yml
+++ b/xci/var/idf.yml
@@ -11,9 +11,6 @@
 
 idf:
   version: 0.1
-  osa:
-  kolla:
-  k8s:
   net_config: &net_config
     admin:
       interface: 0
@@ -37,13 +34,63 @@ idf:
 xci:
   pod_name: vpod1
   net_config: *net_config
-  nodes_roles:
-    opnfv_host: [opnfv_host]
-    node1: [compute, storage]
-    node2: [compute, storage]
-    node3: [controller]
-    node4: [controller]
-    node5: [controller]
+  flavors:
+    mini:
+      - opnfv
+      - node1
+      - node2
+    noha:
+      - opnfv
+      - node1
+      - node2
+      - node3
+    ha:
+      - opnfv
+      - node1
+      - node2
+      - node3
+      - node4
+      - node5
+
+  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
+  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
+        - kude-master
+    hostnames:
+      opnfv: opnfv
+      node1: master1
+      node2: node1
+      node3: node2
+      node4: master2
+      node5: master3
 
   # net_config network to be used by the PXE
   pxe_network: public
@@ -55,7 +102,7 @@ xci:
       ip: 192.168.122.1
 
   extra_addresses:
-    opnfv_host: 192.168.122.2
+    opnfv: 192.168.122.2
 
   # network mapping
   network_mapping: