Merge "[multisite] trigger functest followed daily deployment job"

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

diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml
index 9dd3d54..60fee92 100644 (file)
--- a/jjb/opnfv/installer-params.yml
+++ b/jjb/opnfv/installer-params.yml
@@ -47,7 +47,7 @@
             description: 'Installer used for deploying OPNFV on this POD'
         - string:
             name: EXTERNAL_NETWORK
-            default: 'net04_ext'
+            default: 'admin_floating_net'
             description: 'external network for test'
 
 - parameter:
@@ -63,8 +63,8 @@
             description: 'Installer used for deploying OPNFV on this POD'
         - 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
@@ -73,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"
@@ -89,3 +85,27 @@
             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: 'sandbox-defaults'
+    parameters:
+        - string:
+            name: INSTALLER_IP
+            default: '10.20.0.2'
+            description: 'IP of the installer'
+        - string:
+            name: INSTALLER_TYPE
+            default: sandbox
+            description: 'Installer used for deploying OPNFV on this POD'
+        - string:
+            name: EXTERNAL_NETWORK
+            default: 'admin_floating_net'
+            description: 'external network for test'