X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fopnfv%2Finstaller-params.yml;h=57ca9864eb350202824d4eda1f3555cb9fdddfb6;hb=04fea4722f67ea665cd1122736e3fb4152336138;hp=6fd7a70cd2ec76f99255a93b6bae6546b3fd97a9;hpb=633b858d4dba6377714e6e3129c9ee19753eb48e;p=releng.git

diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml
index 6fd7a70cd..57ca9864e 100644
--- a/jjb/opnfv/installer-params.yml
+++ b/jjb/opnfv/installer-params.yml
@@ -9,17 +9,13 @@
             name: INSTALLER_TYPE
             default: apex
             description: 'Installer used for deploying OPNFV on this POD'
-        - string:
-            name: SDN_CONTROLLER
-            default: 'nosdn'
-            description: 'SDN Controller to use'
         - string:
             name: DEPLOY_SCENARIO
             default: 'none'
             description: 'Scenario to deploy and test'
         - string:
             name: EXTERNAL_NETWORK
-            default: 'net04_ext'
+            default: 'external'
             description: 'external network for test'
 
 - parameter:
@@ -33,14 +29,6 @@
             name: INSTALLER_TYPE
             default: compass
             description: 'Installer used for deploying OPNFV on this POD'
-        - string:
-            name: SDN_CONTROLLER
-            default: 'nosdn'
-            description: 'SDN Controller to use'
-        - string:
-            name: DEPLOY_SCENARIO
-            default: 'none'
-            description: 'Scenario to deploy and test'
         - string:
             name: EXTERNAL_NETWORK
             default: 'ext-net'
@@ -57,13 +45,9 @@
             name: INSTALLER_TYPE
             default: fuel
             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: 'net04_ext'
+            default: 'admin_floating_net'
             description: 'external network for test'
 
 - parameter:
@@ -77,10 +61,6 @@
             name: INSTALLER_TYPE
             default: joid
             description: 'Installer used for deploying OPNFV on this POD'
-        - string:
-            name: DEPLOY_SCENARIO
-            default: 'none'
-            description: 'Scenario to deploy and test'
         - string:
             name: OS_RELEASE
             default: 'liberty'
@@ -93,10 +73,6 @@
             name: CEPH_DISKS
             default: '/srv'
             description: "Disks to use by ceph by default (space separated list)"
-        - string:
-            name: CEPH_DISKS_CONTROLLERS
-            default: ''
-            description: "Disks to use by ceph by controllers (empty if same as CEPH_DISKS)"
         - string:
             name: LAB_CONFIG
             default: "$HOME/joid_config"