summaryrefslogtreecommitdiffstats
path: root/jjb/global
diff options
context:
space:
mode:
authorJulien <zhang.jun3g@zte.com.cn>2017-05-25 18:01:50 +0800
committerJulien <zhang.jun3g@zte.com.cn>2017-05-25 20:57:14 +0800
commit1afb0ddd6faa02d364e9537ba78943e166039cc1 (patch)
treec2d297e9ab60b773aecf5aa56f240cb4f2109587 /jjb/global
parent70bca2b5385ee11e1c06b1435ae711cc79020a9e (diff)
define default parameters for daisy
missing default INSTALLER_IP, BRIDGE parameters for daisy-defaults daisy-baremetal-defaults daisy-virtual-defaults Change-Id: I2632e5d10c8a269c025a923c4759ff18adf311a7 Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
Diffstat (limited to 'jjb/global')
-rw-r--r--jjb/global/installer-params.yml6
-rw-r--r--jjb/global/slave-params.yml14
2 files changed, 18 insertions, 2 deletions
diff --git a/jjb/global/installer-params.yml b/jjb/global/installer-params.yml
index fc9f34a48..40fc42c76 100644
--- a/jjb/global/installer-params.yml
+++ b/jjb/global/installer-params.yml
@@ -95,12 +95,16 @@
parameters:
- string:
name: INSTALLER_IP
- default: '10.20.0.2'
+ default: '10.20.7.3'
description: 'IP of the installer'
- string:
name: INSTALLER_TYPE
default: daisy
description: 'Installer used for deploying OPNFV on this POD'
+ - string:
+ name: BRIDGE
+ default: 'br7'
+ description: 'pxe bridge for booting of Fuel master'
- parameter:
name: 'infra-defaults'
diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml
index 44666a7d1..cdc08eaf4 100644
--- a/jjb/global/slave-params.yml
+++ b/jjb/global/slave-params.yml
@@ -205,6 +205,10 @@
name: SLAVE_LABEL
default: 'daisy-baremetal'
- string:
+ name: INSTALLER_IP
+ default: '10.20.11.2'
+ description: 'IP of the installer'
+ - string:
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
description: 'Git URL to use on this Jenkins Slave'
@@ -284,6 +288,14 @@
name: SLAVE_LABEL
default: 'daisy-virtual'
- string:
+ name: INSTALLER_IP
+ default: '10.20.11.2'
+ description: 'IP of the installer'
+ - string:
+ name: BRIDGE
+ default: 'daisy1'
+ description: 'pxe bridge for booting of Fuel master'
+ - string:
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
description: 'Git URL to use on this Jenkins Slave'
@@ -593,7 +605,7 @@
description: 'Git URL to use on this Jenkins Slave'
- string:
name: INSTALLER_IP
- default: '10.20.7.2'
+ default: '10.20.7.3'
description: 'IP of the installer'
- string:
name: BRIDGE