summaryrefslogtreecommitdiffstats
path: root/controller.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'controller.yaml')
-rw-r--r--controller.yaml14
1 files changed, 13 insertions, 1 deletions
diff --git a/controller.yaml b/controller.yaml
index a5ebab4f..33286d19 100644
--- a/controller.yaml
+++ b/controller.yaml
@@ -24,6 +24,14 @@ parameters:
description: The password for the ceilometer service account.
type: string
hidden: true
+ CinderEnableIscsiBackend:
+ default: true
+ description: Whether to enable or not the Iscsi backend for Cinder
+ type: boolean
+ CinderEnableRbdBackend:
+ default: false
+ description: Whether to enable or not the Rbd backend for Cinder
+ type: boolean
CinderISCSIHelper:
default: tgtadm
description: The iSCSI helper to use with cinder.
@@ -129,6 +137,9 @@ parameters:
type: string
default: ''
hidden: true
+ HeatAuthEncryptionKey:
+ description: Auth encryption key for heat-engine
+ type: string
Image:
type: string
default: overcloud-control
@@ -457,7 +468,7 @@ resources:
admin_password: {get_input: heat_password}
admin_tenant_name: service
admin_user: heat
- auth_encryption_key: unset___________
+ auth_encryption_key: {get_input: heat_auth_encryption_key}
db: {get_input: heat_dsn}
debug: {get_input: debug}
stack_domain_admin_password: {get_input: heat_stack_domain_admin_password}
@@ -690,6 +701,7 @@ resources:
- '/glance'
heat_password: {get_param: HeatPassword}
heat_stack_domain_admin_password: {get_param: HeatStackDomainAdminPassword}
+ heat_auth_encryption_key: {get_param: HeatAuthEncryptionKey}
heat_dsn:
list_join:
- ''