X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fglobal%2Finstaller-params.yml;h=fc9f34a484a11f2aa27c1c7fe20900f30fdfc344;hb=052bb66ad662a0a843c347bc32be03f11bc70f07;hp=4a50a590627ce80a95521487cbdef5d9e5ca2a29;hpb=488e028f74e588c979d31144c409c425b29cc6fd;p=releng.git

diff --git a/jjb/global/installer-params.yml b/jjb/global/installer-params.yml
index 4a50a5906..fc9f34a48 100644
--- a/jjb/global/installer-params.yml
+++ b/jjb/global/installer-params.yml
@@ -9,10 +9,6 @@
             name: INSTALLER_TYPE
             default: apex
             description: 'Installer used for deploying OPNFV on this POD'
-        - string:
-            name: DEPLOY_SCENARIO
-            default: 'none'
-            description: 'Scenario to deploy and test'
         - string:
             name: EXTERNAL_NETWORK
             default: 'external'
@@ -65,6 +61,10 @@
             name: INSTALLER_TYPE
             default: joid
             description: 'Installer used for deploying OPNFV on this POD'
+        - string:
+            name: MODEL
+            default: 'os'
+            description: 'Model to deploy (os|k8)'
         - string:
             name: OS_RELEASE
             default: 'newton'
@@ -89,6 +89,19 @@
             name: CPU_ARCHITECTURE
             default: 'amd64'
             description: "CPU Architecture to use for Ubuntu distro "
+
+- parameter:
+    name: 'daisy-defaults'
+    parameters:
+        - string:
+            name: INSTALLER_IP
+            default: '10.20.0.2'
+            description: 'IP of the installer'
+        - string:
+            name: INSTALLER_TYPE
+            default: daisy
+            description: 'Installer used for deploying OPNFV on this POD'
+
 - parameter:
     name: 'infra-defaults'
     parameters:
@@ -109,12 +122,8 @@
             description: 'IP of the installer'
         - string:
             name: INSTALLER_TYPE
-            default: netvirt
+            default: apex
             description: 'Installer used for deploying OPNFV on this POD'
-        - string:
-            name: DEPLOY_SCENARIO
-            default: 'os-odl_l2-bgpvpn-noha'
-            description: 'Scenario to deploy and test'
         - string:
             name: EXTERNAL_NETWORK
             default: 'external'