joid support of Newton.

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

diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml
index 98a15de..55f4769 100644 (file)
--- a/jjb/opnfv/installer-params.yml
+++ b/jjb/opnfv/installer-params.yml
@@ -49,13 +49,17 @@
             name: EXTERNAL_NETWORK
             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'
     parameters:
         - string:
             name: INSTALLER_IP
-            default: '192.168.Y.Y'
+            default: '192.168.122.5'
             description: 'IP of the installer'
         - string:
             name: INSTALLER_TYPE
@@ -63,33 +67,36 @@
             description: 'Installer used for deploying OPNFV on this POD'
         - string:
             name: OS_RELEASE
-            default: 'mitaka'
-            description: 'OpenStack release (liberty|mitaka)'
+            default: 'newton'
+            description: 'OpenStack release (mitaka|newton)'
         - 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)"
+            default: ext-net
+            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: 'trusty'
-            description: "Ubuntu distribution to use for Openstack (trusty|xenial)"
+            default: 'xenial'
+            description: "Ubuntu distribution to use for Openstack (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'