X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopnfv%2Finstaller-params.yml;h=ec0b861704a4ec5742a95c804ee955223a099121;hb=f651e964a69d44da8a9c5ef6f7bbda432276ced6;hp=0ed48652463f55e44d621d4376bc8375c3a5a74a;hpb=9d0d0dfecdfc3982532265558238e1dff06e9620;p=releng.git

diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml
index 0ed486524..ec0b86170 100644
--- a/jjb/opnfv/installer-params.yml
+++ b/jjb/opnfv/installer-params.yml
@@ -29,10 +29,6 @@
             name: INSTALLER_TYPE
             default: compass
             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: 'ext-net'
@@ -49,14 +45,14 @@
             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'
+        - string:
+            name: BRIDGE
+            default: 'pxebr'
+            description: 'pxe bridge for booting of Fuel master'
 
 - parameter:
     name: 'joid-defaults'
@@ -69,35 +65,38 @@
             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'
-            description: 'OpenStack release (kilo|liberty)'
+            default: 'mitaka'
+            description: 'OpenStack release (liberty|mitaka)'
         - string:
             name: EXTERNAL_NETWORK
-            default: ext-net;flat;192.168.0.2;192.168.0.253;192.168.0.1;192.168.0.0/24
-            description: "External network to create (name;type;first ip;last ip; gateway;network)"
-        - string:
-            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)"
+            default: ext-net4
+            description: "External network used for Floating ips."
         - string:
             name: LAB_CONFIG
             default: "$HOME/joid_config"
             description: "Local lab config and Openstack openrc location"
-        - string:
-            name: CEPH_REFORMAT
-            default: 'false'
-            description: "Format or not disk before using ceph [true/false] (must be done the first time)"
         - string:
             name: MAAS_REINSTALL
             default: 'false'
             description: "Reinstall MAAS and Bootstrap before deploy [true/false]"
+        - string:
+            name: UBUNTU_DISTRO
+            default: 'xenial'
+            description: "Ubuntu distribution to use for Openstack (trusty|xenial)"
+        - string:
+            name: CPU_ARCHITECTURE
+            default: 'amd64'
+            description: "CPU Architecture to use for Ubuntu distro "
+- parameter:
+    name: 'infra-defaults'
+    parameters:
+        - string:
+            name: INSTALLER_IP
+            default: '192.168.122.2'
+            description: 'IP of the installer'
+        - string:
+            name: INSTALLER_TYPE
+            default: infra
+            description: 'Installer used for deploying OPNFV on this POD'