X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopnfv%2Finstaller-params.yml;h=282ced5cca822fabd7207282317329cce16b1cd9;hb=fcd11d5c9959bfb1ec50c846216a923e97a70463;hp=dc11fbd53971d317476696f68b9ae1a7d413482a;hpb=186c75520367313ec3ac55f3ffdd825f2c8b3b29;p=releng.git

diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml
index dc11fbd53..282ced5cc 100644
--- a/jjb/opnfv/installer-params.yml
+++ b/jjb/opnfv/installer-params.yml
@@ -6,37 +6,33 @@
             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: DEPLOY_SCENARIO
+            default: 'none'
+            description: 'Scenario to deploy and test'
         - string:
-            name: CONTROLLER
-            default: '{controller}'
-            description: 'Controller name'
+            name: EXTERNAL_NETWORK
+            default: 'external'
+            description: 'external network for test'
 
 - 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: EXTERNAL_NETWORK
+            default: 'ext-net'
+            description: 'external network for test'
 
 - parameter:
     name: 'fuel-defaults'
@@ -45,18 +41,14 @@
             name: INSTALLER_IP
             default: '10.20.0.2'
             description: 'IP of the installer'
-        - string:
-            name: INSTALLER_NAME
-            default: fuel
-            description: 'Installer used for deploying OPNFV on this POD'
         - string:
             name: INSTALLER_TYPE
-            default: $INSTALLER_NAME
+            default: fuel
             description: 'Installer used for deploying OPNFV on this POD'
         - string:
-            name: CONTROLLER
-            default: '{controller}'
-            description: 'Controller name'
+            name: EXTERNAL_NETWORK
+            default: 'net04_ext'
+            description: 'external network for test'
 
 - parameter:
     name: 'joid-defaults'
@@ -66,14 +58,38 @@
             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: OS_RELEASE
+            default: 'liberty'
+            description: 'OpenStack release (kilo|liberty)'
+        - string:
+            name: EXTERNAL_NETWORK
+            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"
+            description: "Local lab config and Openstack openrc location"
+        - string:
+            name: CEPH_REFORMAT
+            default: 'false'
+            description: "Format or not disk before using ceph [true/false] (must be done the first time)"
+        - string:
+            name: MAAS_REINSTALL
+            default: 'false'
+            description: "Reinstall MAAS and Bootstrap before deploy [true/false]"
         - string:
-            name: CONTROLLER
-            default: '{controller}'
-            description: 'Controller name'
+            name: DEPLOY_SCENARIO
+            default: 'os-odl_l2-nofeature-ha'
+            description: "Scenario to deploy and test"