joid: Pass all parameters to subjobs

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

diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml
index 876cb1f..282ced5 100644 (file)
--- a/jjb/opnfv/installer-params.yml
+++ b/jjb/opnfv/installer-params.yml
@@ -9,17 +9,13 @@
             name: INSTALLER_TYPE
             default: apex
             description: 'Installer used for deploying OPNFV on this POD'
-        - string:
-            name: SDN_CONTROLLER
-            default: 'nosdn'
-            description: 'SDN Controller to use'
         - string:
             name: DEPLOY_SCENARIO
             default: 'none'
             description: 'Scenario to deploy and test'
         - string:
             name: EXTERNAL_NETWORK
-            default: 'net04_ext'
+            default: 'external'
             description: 'external network for test'
 
 - parameter:
@@ -33,14 +29,6 @@
             name: INSTALLER_TYPE
             default: compass
             description: 'Installer used for deploying OPNFV on this POD'
-        - string:
-            name: SDN_CONTROLLER
-            default: 'nosdn'
-            description: 'SDN Controller to use'
-        - string:
-            name: DEPLOY_SCENARIO
-            default: 'none'
-            description: 'Scenario to deploy and test'
         - string:
             name: EXTERNAL_NETWORK
             default: 'ext-net'
@@ -57,14 +45,6 @@
             name: INSTALLER_TYPE
             default: fuel
             description: 'Installer used for deploying OPNFV on this POD'
-        - string:
-            name: SDN_CONTROLLER
-            default: 'nosdn'
-            description: 'SDN Controller to use'
-        - string:
-            name: DEPLOY_SCENARIO
-            default: 'none'
-            description: 'Scenario to deploy and test'
         - string:
             name: EXTERNAL_NETWORK
             default: 'net04_ext'
@@ -81,30 +61,22 @@
             name: INSTALLER_TYPE
             default: joid
             description: 'Installer used for deploying OPNFV on this POD'
-        - string:
-            name: SDN_CONTROLLER
-            default: 'nosdn'
-            description: 'SDN Controller to use'
-        - string:
-            name: DEPLOY_SCENARIO
-            default: 'none'
-            description: 'Scenario to deploy and test'
-        - string:
-            name: HA_MODE
-            default: 'ha'
-            description: 'High Availability mode (ha|nonha)'
         - string:
             name: OS_RELEASE
             default: 'liberty'
             description: 'OpenStack release (kilo|liberty)'
         - string:
             name: EXTERNAL_NETWORK
-            default: 'net04_ext'
-            description: 'external network for test'
+            default: ext-net;flat;192.168.0.2;192.168.0.253;192.168.0.1;192.168.0.0/24
+            description: "External network to create (name;type;first ip;last ip; gateway;network)"
         - string:
             name: CEPH_DISKS
             default: '/srv'
             description: "Disks to use by ceph by default (space separated list)"
+        - string:
+            name: CEPH_DISKS_CONTROLLERS
+            default: ''
+            description: "Disks to use by ceph by controllers (empty if same as CEPH_DISKS)"
         - string:
             name: LAB_CONFIG
             default: "$HOME/joid_config"
@@ -117,3 +89,7 @@
             name: MAAS_REINSTALL
             default: 'false'
             description: "Reinstall MAAS and Bootstrap before deploy [true/false]"
+        - string:
+            name: DEPLOY_SCENARIO
+            default: 'os-odl_l2-nofeature-ha'
+            description: "Scenario to deploy and test"