diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-25 22:28:03 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-25 22:28:03 +0000 |
| commit | a0dd794ee3002a6fbe8ddfc4b4c1fa1c51686847 (patch) | |
| tree | b966ec0f59140b9c7ba6261a31bb6c9ce1136e0a /puppet/services/heat-engine.yaml | |
| parent | 081f787b465d88be9bdc10d0540151b81db3a89f (diff) | |
| parent | 43476e235ce11359a5327f9dfca671b8ffeb5ab9 (diff) | |
Merge "Move glance/heat hiera settings to services"
Diffstat (limited to 'puppet/services/heat-engine.yaml')
| -rw-r--r-- | puppet/services/heat-engine.yaml | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/puppet/services/heat-engine.yaml b/puppet/services/heat-engine.yaml index fba80c5d..b230ec1d 100644 --- a/puppet/services/heat-engine.yaml +++ b/puppet/services/heat-engine.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2016-04-08 +heat_template_version: 2016-10-14 description: > Openstack Heat Engine service configured with Puppet @@ -35,6 +35,11 @@ parameters: description: Password for heat_stack_domain_admin user. type: string hidden: true + HeatAuthEncryptionKey: + description: Auth encryption key for heat-engine + type: string + hidden: true + default: '' resources: HeatBase: @@ -76,5 +81,12 @@ outputs: heat::db::mysql::allowed_hosts: - '%' - "%{hiera('mysql_bind_host')}" + heat::engine::auth_encryption_key: + yaql: + expression: $.data.passwords.where($ != '').first() + data: + passwords: + - {get_param: HeatAuthEncryptionKey} + - {get_param: [DefaultPasswords, heat_auth_encryption_key]} step_config: | include ::tripleo::profile::base::heat::engine |