diff options
author | Dan Prince <dprince@redhat.com> | 2016-08-24 14:02:13 -0400 |
---|---|---|
committer | Dan Prince <dprince@redhat.com> | 2016-08-25 08:21:56 -0400 |
commit | 43476e235ce11359a5327f9dfca671b8ffeb5ab9 (patch) | |
tree | f39cf0eb02cbaadc6d07a9f98b4ec5280bf5fd93 /puppet/services/heat-engine.yaml | |
parent | 319c42475c3c8b611bf685ca0aff4e9b79d0b570 (diff) |
Move glance/heat hiera settings to services
This patch removes the remaining bind IP, and password
settings for Heat and Glance into the composable services.
Change-Id: I17abcb2a08a1972cbcf8163f6608ac22ddfc15f7
Related-bug: #1604414
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 |