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 "change scenario owner"
[releng.git]
/
jjb
/
global
/
installer-params.yml
diff --git
a/jjb/global/installer-params.yml
b/jjb/global/installer-params.yml
index
8e957eb
..
a81dce3
100644
(file)
--- a/
jjb/global/installer-params.yml
+++ b/
jjb/global/installer-params.yml
@@
-9,10
+9,6
@@
name: INSTALLER_TYPE
default: apex
description: 'Installer used for deploying OPNFV on this POD'
name: INSTALLER_TYPE
default: apex
description: 'Installer used for deploying OPNFV on this POD'
- - string:
- name: DEPLOY_SCENARIO
- default: 'none'
- description: 'Scenario to deploy and test'
- string:
name: EXTERNAL_NETWORK
default: 'external'
- string:
name: EXTERNAL_NETWORK
default: 'external'
@@
-41,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
@@
-52,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'
@@
-71,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
@@
-93,6
+97,23
@@
name: CPU_ARCHITECTURE
default: 'amd64'
description: "CPU Architecture to use for Ubuntu distro "
name: CPU_ARCHITECTURE
default: 'amd64'
description: "CPU Architecture to use for Ubuntu distro "
+
+- parameter:
+ name: 'daisy-defaults'
+ parameters:
+ - string:
+ name: INSTALLER_IP
+ 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 Daisy master'
+
- parameter:
name: 'infra-defaults'
parameters:
- parameter:
name: 'infra-defaults'
parameters:
@@
-113,12
+134,8
@@
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'
description: 'Installer used for deploying OPNFV on this POD'
- - string:
- name: DEPLOY_SCENARIO
- default: 'os-odl_l2-bgpvpn-noha'
- description: 'Scenario to deploy and test'
- string:
name: EXTERNAL_NETWORK
default: 'external'
- string:
name: EXTERNAL_NETWORK
default: 'external'