Merge "Fix error in qtip job template"

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

diff --git a/jjb/global/installer-params.yml b/jjb/global/installer-params.yml
index e9f48ae..17101ed 100644 (file)
--- a/jjb/global/installer-params.yml
+++ b/jjb/global/installer-params.yml
@@ -41,6 +41,10 @@
             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
@@ -51,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'
@@ -71,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