Add JOID project parameters and a final openstack test to check deploy result

[releng.git] / jjb / opnfv / installer-params.yml

diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml
index dc11fbd..1bd1ce7 100644 (file)
--- a/jjb/opnfv/installer-params.yml
+++ b/jjb/opnfv/installer-params.yml
@@ -6,37 +6,37 @@
             default: '192.168.X.X'
             description: 'IP of the installer'
         - string:
-            name: INSTALLER_NAME
+            name: INSTALLER_TYPE
             default: apex
             description: 'Installer used for deploying OPNFV on this POD'
         - string:
-            name: INSTALLER_TYPE
-            default: $INSTALLER_NAME
-            description: 'Installer used for deploying OPNFV on this POD'
+            name: SDN_CONTROLLER
+            default: 'nosdn'
+            description: 'SDN Controller to use'
         - string:
-            name: CONTROLLER
-            default: '{controller}'
-            description: 'Controller name'
+            name: OPNFV_FEATURE
+            default: 'none'
+            description: 'OPNFV Feature to activate'
 
 - parameter:
-    name: 'compass4nfv-defaults'
+    name: 'compass-defaults'
     parameters:
         - string:
             name: INSTALLER_IP
             default: '192.168.200.2'
             description: 'IP of the installer'
-        - string:
-            name: INSTALLER_NAME
-            default: compass4nfv
-            description: 'Installer used for deploying OPNFV on this POD'
         - string:
             name: INSTALLER_TYPE
-            default: $INSTALLER_NAME
+            default: compass
             description: 'Installer used for deploying OPNFV on this POD'
         - string:
-            name: CONTROLLER
-            default: '{controller}'
-            description: 'Controller name'
+            name: SDN_CONTROLLER
+            default: 'nosdn'
+            description: 'SDN Controller to use'
+        - string:
+            name: OPNFV_FEATURE
+            default: 'none'
+            description: 'OPNFV Feature to activate'
 
 - parameter:
     name: 'fuel-defaults'
@@ -46,17 +46,17 @@
             default: '10.20.0.2'
             description: 'IP of the installer'
         - string:
-            name: INSTALLER_NAME
+            name: INSTALLER_TYPE
             default: fuel
             description: 'Installer used for deploying OPNFV on this POD'
         - string:
-            name: INSTALLER_TYPE
-            default: $INSTALLER_NAME
-            description: 'Installer used for deploying OPNFV on this POD'
+            name: SDN_CONTROLLER
+            default: 'nosdn'
+            description: 'SDN Controller to use'
         - string:
-            name: CONTROLLER
-            default: '{controller}'
-            description: 'Controller name'
+            name: OPNFV_FEATURE
+            default: 'none'
+            description: 'OPNFV Feature to activate'
 
 - parameter:
     name: 'joid-defaults'
@@ -66,14 +66,22 @@
             default: '192.168.Y.Y'
             description: 'IP of the installer'
         - string:
-            name: INSTALLER_NAME
+            name: INSTALLER_TYPE
             default: joid
             description: 'Installer used for deploying OPNFV on this POD'
         - string:
-            name: INSTALLER_TYPE
-            default: $INSTALLER_NAME
-            description: 'Installer used for deploying OPNFV on this POD'
+            name: SDN_CONTROLLER
+            default: 'nosdn'
+            description: 'SDN Controller to use'
+        - string:
+            name: OPNFV_FEATURE
+            default: 'none'
+            description: 'OPNFV Feature to activate'
+        - string:
+            name: HA_MODE
+            default: 'ha'
+            description: 'High Availability mode (ha|nonha)'
         - string:
-            name: CONTROLLER
-            default: '{controller}'
-            description: 'Controller name'
+            name: OS_RELEASE
+            default: 'liberty'
+            description: 'OpenStack release (kilo|liberty)'