Complete osa and add kubespray to the idf schema

Modify idf of lf pod4 to aoid -1 from Jenkins

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

diff --git a/config/pdf/idf-pod1.schema.yaml b/config/pdf/idf-pod1.schema.yaml
index ec2cc71..a1108a0 100644 (file)
--- a/config/pdf/idf-pod1.schema.yaml
+++ b/config/pdf/idf-pod1.schema.yaml
@@ -142,6 +142,20 @@ definitions:
       required: ['jumphost', 'network']
       additionalProperties: false
   osa:
+    v0.1:
+      type: 'object'
+      properties:
+        nodes_roles:
+          type: 'object'
+        groups:
+          type: 'object'
+        hostnames:
+          type: 'object'
+        network:
+          type: 'object'
+      required: ['nodes_roles', 'groups', 'hostnames', 'network']
+      additionalProperties: false
+  kubespray:
     v0.1:
       type: ['object', 'null']
       # NOTE: To be properly modeled by XCI maintainers
@@ -164,7 +178,7 @@ properties:
         type: 'array'
         items:
           type: 'string'
-          enum: ['apex', 'compass4nfv', 'daisy', 'fuel', 'joid', 'osa']
+          enum: ['apex', 'compass4nfv', 'daisy', 'fuel', 'joid', 'osa', 'kubespray']
       net_config:
         type: 'object'
       compass:
@@ -175,6 +189,8 @@ properties:
         type: 'object'
       osa:
         type: ['object', 'null']
+      kubespray:
+        type: ['object', 'null']
     required: ['version']
     additionalProperties: false
     ############################################################################
@@ -194,12 +210,16 @@ properties:
             $ref: '#/definitions/fuel/v0.1'
           osa:
             $ref: '#/definitions/osa/v0.1'
+          kubespray:
+            $ref: '#/definitions/kubespray/v0.1'
       fuel:
         required: ['net_config']
       daisy:
         required: ['net_config']
       osa:
         required: ['net_config']
+      kubespray:
+        required: ['net_config']
   xci:
     type: 'object'
     # NOTE: To be properly modeled by XCI maintainers

diff --git a/labs/lf/idf-pod4.yaml b/labs/lf/idf-pod4.yaml
index 69fd171..f8deeb0 100644 (file)
--- a/labs/lf/idf-pod4.yaml
+++ b/labs/lf/idf-pod4.yaml
@@ -48,6 +48,43 @@ idf:
         - 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: mgmt
+        # 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'
+        - 'eno3.452'
+        - 'eno4.451'
+        - 'eno4.414'
   fuel:
     jumphost:
       bridges: