diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-03-16 19:02:42 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-03-16 19:02:42 +0000 |
| commit | 29327cd0902cc88229c693b44449f03bf88e911f (patch) | |
| tree | c185d7a6afbc1822e819a2fe115a0c1dc88764ff /controller.yaml | |
| parent | 4bc4171a151ebac2c9f1e42aed7dc23de844e429 (diff) | |
| parent | b05137d61ae3a0ab2abcf0e259446183d3f5ddd8 (diff) | |
Merge "Make heat auth_encryption_key random"
Diffstat (limited to 'controller.yaml')
| -rw-r--r-- | controller.yaml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/controller.yaml b/controller.yaml index 52efa31b..2dcfb50e 100644 --- a/controller.yaml +++ b/controller.yaml @@ -133,6 +133,9 @@ parameters: type: string default: '' hidden: true + HeatAuthEncryptionKey: + description: Auth encryption key for heat-engine + type: string Image: type: string default: overcloud-control @@ -461,7 +464,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} @@ -694,6 +697,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: - '' |