armband: Fix default params for labeled pods

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

diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml
index 3e5c0ff..ec0b861 100644 (file)
--- 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,18 +45,14 @@
             name: INSTALLER_TYPE
             default: fuel
             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: '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'
@@ -82,22 +66,37 @@
             default: joid
             description: 'Installer used for deploying OPNFV on this POD'
         - string:
-            name: SDN_CONTROLLER
-            default: 'nosdn'
-            description: 'SDN Controller to use'
+            name: OS_RELEASE
+            default: 'mitaka'
+            description: 'OpenStack release (liberty|mitaka)'
         - string:
-            name: DEPLOY_SCENARIO
-            default: 'none'
-            description: 'Scenario to deploy and test'
+            name: EXTERNAL_NETWORK
+            default: ext-net4
+            description: "External network used for Floating ips."
         - string:
-            name: HA_MODE
-            default: 'ha'
-            description: 'High Availability mode (ha|nonha)'
+            name: LAB_CONFIG
+            default: "$HOME/joid_config"
+            description: "Local lab config and Openstack openrc location"
         - string:
-            name: OS_RELEASE
-            default: 'liberty'
-            description: 'OpenStack release (kilo|liberty)'
+            name: MAAS_REINSTALL
+            default: 'false'
+            description: "Reinstall MAAS and Bootstrap before deploy [true/false]"
         - string:
-            name: EXTERNAL_NETWORK
-            default: 'net04_ext'
-            description: 'external network for test'
+            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'