Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Move sysctl settings into hieradata
[apex-tripleo-heat-templates.git]
/
controller.yaml
diff --git
a/controller.yaml
b/controller.yaml
index
71b8a04
..
bbac3a6
100644
(file)
--- a/
controller.yaml
+++ b/
controller.yaml
@@
-148,6
+148,13
@@
parameters:
default: http
description: Protocol to use when connecting to glance, set to https for SSL.
type: string
default: http
description: Protocol to use when connecting to glance, set to https for SSL.
type: string
+ GlanceBackend:
+ default: swift
+ description: The short name of the Glance backend to use. Should be one
+ of swift, rbd, or file
+ type: string
+ constraints:
+ - allowed_values: ['swift', 'file', 'rbd']
HeatPassword:
default: unset
description: The password for the Heat service account, used by the Heat services.
HeatPassword:
default: unset
description: The password for the Heat service account, used by the Heat services.
@@
-161,6
+168,9
@@
parameters:
HeatAuthEncryptionKey:
description: Auth encryption key for heat-engine
type: string
HeatAuthEncryptionKey:
description: Auth encryption key for heat-engine
type: string
+ HorizonSecret:
+ description: Secret key for Django
+ type: string
Image:
type: string
default: overcloud-control
Image:
type: string
default: overcloud-control
@@
-198,6
+208,10
@@
parameters:
description: Keystone key for signing tokens.
type: string
hidden: true
description: Keystone key for signing tokens.
type: string
hidden: true
+ MysqlClustercheckPassword:
+ type: string
+ hidden: true
+ default: '' # Has to be here because of the ignored empty value bug
MysqlClusterUniquePart:
description: A unique identifier of the MySQL cluster the controller is in.
type: string
MysqlClusterUniquePart:
description: A unique identifier of the MySQL cluster the controller is in.
type: string