X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fglobal%2Finstaller-params.yml;h=17101ed76131f9fbe076a0e19f75c6a058da9a99;hb=8fcf54dee04407c6f04ecf47e703dba13a3e1151;hp=6e965a9cbe0722d5ce2dde4880bf7bf792032c17;hpb=b67046c7b27e75a20e21cb452b8a897a0b759bed;p=releng.git

diff --git a/jjb/global/installer-params.yml b/jjb/global/installer-params.yml
index 6e965a9cb..17101ed76 100644
--- a/jjb/global/installer-params.yml
+++ b/jjb/global/installer-params.yml
@@ -37,6 +37,14 @@
             name: INSTALLER_IP
             default: '10.20.0.2'
             description: 'IP of the installer'
+        - string:
+            name: SALT_MASTER_IP
+            default: '192.168.10.100'
+            description: 'IP of the salt master (for mcp deployments)'
+        - string:
+            name: SSH_KEY
+            default: '/tmp/mcp.rsa'
+            description: 'Path to private SSH key to access environment nodes'
         - string:
             name: INSTALLER_TYPE
             default: fuel
@@ -47,8 +55,8 @@
             description: 'external network for test'
         - string:
             name: BRIDGE
-            default: 'pxebr'
-            description: 'pxe bridge for booting of Fuel master'
+            default: ',,,'
+            description: 'Bridge(s) to be used by salt master'
 
 - parameter:
     name: 'joid-defaults'
@@ -67,8 +75,8 @@
             description: 'Model to deploy (os|k8)'
         - string:
             name: OS_RELEASE
-            default: 'newton'
-            description: 'OpenStack release (mitaka|newton)'
+            default: 'ocata'
+            description: 'OpenStack release (mitaka|newton|ocata)'
         - string:
             name: EXTERNAL_NETWORK
             default: ext-net
@@ -89,6 +97,23 @@
             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.7.3'
+            description: 'IP of the installer'
+        - string:
+            name: INSTALLER_TYPE
+            default: daisy
+            description: 'Installer used for deploying OPNFV on this POD'
+        - string:
+            name: BRIDGE
+            default: 'br7'
+            description: 'pxe bridge for booting of Fuel master'
+
 - parameter:
     name: 'infra-defaults'
     parameters:
@@ -109,7 +134,7 @@
             description: 'IP of the installer'
         - string:
             name: INSTALLER_TYPE
-            default: netvirt
+            default: apex
             description: 'Installer used for deploying OPNFV on this POD'
         - string:
             name: EXTERNAL_NETWORK