Merge "change dovetail CI jobs on Apex"

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

diff --git a/jjb/global/installer-params.yml b/jjb/global/installer-params.yml
index 1415a6e..683ef78 100644 (file)
--- a/jjb/global/installer-params.yml
+++ b/jjb/global/installer-params.yml
@@ -50,10 +50,6 @@
           name: EXTERNAL_NETWORK
           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}'
@@ -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'