Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "add Calipso Jenkins job: run unit tests"
[releng.git]
/
jjb
/
global
/
installer-params.yml
diff --git
a/jjb/global/installer-params.yml
b/jjb/global/installer-params.yml
index
c3e7756
..
a81dce3
100644
(file)
--- a/
jjb/global/installer-params.yml
+++ b/
jjb/global/installer-params.yml
@@
-37,6
+37,14
@@
name: INSTALLER_IP
default: '10.20.0.2'
description: 'IP of the installer'
name: INSTALLER_IP
default: '10.20.0.2'
description: 'IP of the installer'
+ - string:
+ name: SALT_MASTER_IP
+ default: '192.168.10.100'
+ description: 'IP of the salt master (for mcp deployments)'
+ - string:
+ name: SSH_KEY
+ default: '/tmp/mcp.rsa'
+ description: 'Path to private SSH key to access environment nodes'
- string:
name: INSTALLER_TYPE
default: fuel
- string:
name: INSTALLER_TYPE
default: fuel
@@
-48,7
+56,7
@@
- string:
name: BRIDGE
default: 'pxebr'
- string:
name: BRIDGE
default: 'pxebr'
- description: '
pxe bridge for booting of Fuel
master'
+ description: '
Bridge(s) to be used by salt
master'
- parameter:
name: 'joid-defaults'
- parameter:
name: 'joid-defaults'
@@
-67,8
+75,8
@@
description: 'Model to deploy (os|k8)'
- string:
name: OS_RELEASE
description: 'Model to deploy (os|k8)'
- string:
name: OS_RELEASE
- default: '
newton
'
- description: 'OpenStack release (mitaka|newton)'
+ default: '
ocata
'
+ description: 'OpenStack release (mitaka|newton
|ocata
)'
- string:
name: EXTERNAL_NETWORK
default: ext-net
- string:
name: EXTERNAL_NETWORK
default: ext-net
@@
-95,12
+103,16
@@
parameters:
- string:
name: INSTALLER_IP
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'
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 Daisy master'
- parameter:
name: 'infra-defaults'
- parameter:
name: 'infra-defaults'
@@
-122,7
+134,7
@@
description: 'IP of the installer'
- string:
name: INSTALLER_TYPE
description: 'IP of the installer'
- string:
name: INSTALLER_TYPE
- default:
netvirt
+ default:
apex
description: 'Installer used for deploying OPNFV on this POD'
- string:
name: EXTERNAL_NETWORK
description: 'Installer used for deploying OPNFV on this POD'
- string:
name: EXTERNAL_NETWORK