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
Ensures mongodb configuration only happens if mongodb is needed
[apex-tripleo-heat-templates.git]
/
controller.yaml
diff --git
a/controller.yaml
b/controller.yaml
index
b578a25
..
bbac3a6
100644
(file)
--- a/
controller.yaml
+++ b/
controller.yaml
@@
-14,6
+14,10
@@
parameters:
description: The keystone auth secret.
type: string
hidden: true
description: The keystone auth secret.
type: string
hidden: true
+ CeilometerBackend:
+ default: 'mongodb'
+ description: The ceilometer backend type.
+ type: string
CeilometerMeteringSecret:
default: unset
description: Secret shared by the ceilometer services.
CeilometerMeteringSecret:
default: unset
description: Secret shared by the ceilometer services.
@@
-144,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.
@@
-157,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
@@
-194,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
@@
-922,7
+940,7
@@
outputs:
Server's IP address and hostname in the /etc/hosts format
value:
str_replace:
Server's IP address and hostname in the /etc/hosts format
value:
str_replace:
- template: IP HOST
HOST.novalocal
CLOUDNAME
+ template: IP HOST CLOUDNAME
params:
IP: {get_attr: [Controller, networks, ctlplane, 0]}
HOST: {get_attr: [Controller, name]}
params:
IP: {get_attr: [Controller, networks, ctlplane, 0]}
HOST: {get_attr: [Controller, name]}