X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fglobal%2Finstaller-params.yml;h=f663c455683210a0717d9f161c300a093077f4af;hb=a1561e7b31740af314175b1c321e6bc6a7eade87;hp=ecef6d3b7c61ec0dc79d57dbdd838ebb45647df3;hpb=20b31307c730a6561107dba6299d3a47dd4c3090;p=releng.git

diff --git a/jjb/global/installer-params.yml b/jjb/global/installer-params.yml
index ecef6d3b7..f663c4556 100644
--- a/jjb/global/installer-params.yml
+++ b/jjb/global/installer-params.yml
@@ -38,13 +38,9 @@
           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: "$HOME/opnfv/mcp.rsa"
+          default: "/var/lib/opnfv/mcp.rsa"
           description: 'Path to private SSH key to access environment nodes'
       - string:
           name: INSTALLER_TYPE
@@ -52,16 +48,16 @@
           description: 'Installer used for deploying OPNFV on this POD'
       - string:
           name: EXTERNAL_NETWORK
-          default: 'admin_floating_net'
+          default: 'floating_net'
           description: 'external network for test'
-      - string:
-          name: BRIDGE
-          default: 'pxebr'
-          description: 'Bridge(s) to be used by salt master'
       - string:
           name: GS_URL
           default: '$GS_BASE{gs-pathname}'
           description: "URL to Google Storage."
+      - string:
+          name: CI_DEBUG
+          default: 'false'
+          description: "Show debug output information"
 
 - parameter:
     name: 'joid-defaults'
@@ -80,8 +76,8 @@
           description: 'Model to deploy (os|k8)'
       - string:
           name: OS_RELEASE
-          default: 'ocata'
-          description: 'OpenStack release (mitaka|newton|ocata)'
+          default: 'pike'
+          description: 'OpenStack release (mitaka|ocata|pike)'
       - string:
           name: EXTERNAL_NETWORK
           default: ext-net
@@ -118,6 +114,10 @@
           name: BRIDGE
           default: 'br7'
           description: 'pxe bridge for booting of Daisy master'
+      - string:
+          name: EXTERNAL_NETWORK
+          default: 'admin_external'
+          description: 'external network for test'
 
 - parameter:
     name: 'infra-defaults'
@@ -146,3 +146,11 @@
           name: EXTERNAL_NETWORK
           default: 'external'
           description: 'external network for test'
+
+- parameter:
+    name: 'deploy-scenario'
+    parameters:
+      - string:
+          name: DEPLOY_SCENARIO
+          default: 'os-nosdn-nofeature-ha'
+          description: "OPNFV deployment scenario"