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 Python Linting Job"
[releng.git]
/
jjb
/
opnfv
/
installer-params.yml
diff --git
a/jjb/opnfv/installer-params.yml
b/jjb/opnfv/installer-params.yml
index
6fd7a70
..
57ca986
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'
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
- 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:
description: 'external network for test'
- parameter:
@@
-33,14
+29,6
@@
name: INSTALLER_TYPE
default: compass
description: 'Installer used for deploying OPNFV on this POD'
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'
- string:
name: EXTERNAL_NETWORK
default: 'ext-net'
@@
-57,13
+45,9
@@
name: INSTALLER_TYPE
default: fuel
description: 'Installer used for deploying OPNFV on this POD'
name: INSTALLER_TYPE
default: fuel
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
- string:
name: EXTERNAL_NETWORK
- default: '
net04_ex
t'
+ default: '
admin_floating_ne
t'
description: 'external network for test'
- parameter:
description: 'external network for test'
- parameter:
@@
-77,10
+61,6
@@
name: INSTALLER_TYPE
default: joid
description: 'Installer used for deploying OPNFV on this POD'
name: INSTALLER_TYPE
default: joid
description: 'Installer used for deploying OPNFV on this POD'
- - string:
- name: DEPLOY_SCENARIO
- default: 'none'
- description: 'Scenario to deploy and test'
- string:
name: OS_RELEASE
default: 'liberty'
- string:
name: OS_RELEASE
default: 'liberty'
@@
-93,10
+73,6
@@
name: CEPH_DISKS
default: '/srv'
description: "Disks to use by ceph by default (space separated list)"
name: CEPH_DISKS
default: '/srv'
description: "Disks to use by ceph by default (space separated list)"
- - string:
- name: CEPH_DISKS_CONTROLLERS
- default: ''
- description: "Disks to use by ceph by controllers (empty if same as CEPH_DISKS)"
- string:
name: LAB_CONFIG
default: "$HOME/joid_config"
- string:
name: LAB_CONFIG
default: "$HOME/joid_config"