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
ee154af
..
a81dce3
100644
(file)
--- a/
jjb/global/installer-params.yml
+++ b/
jjb/global/installer-params.yml
@@
-56,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'
@@
-75,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
@@
-112,7
+112,7
@@
- string:
name: BRIDGE
default: 'br7'
- string:
name: BRIDGE
default: 'br7'
- description: 'pxe bridge for booting of
Fuel
master'
+ description: 'pxe bridge for booting of
Daisy
master'
- parameter:
name: 'infra-defaults'
- parameter:
name: 'infra-defaults'