diff options
author | Martin Mágr <mmagr@redhat.com> | 2015-03-02 11:04:20 +0100 |
---|---|---|
committer | Martin Mágr <mmagr@redhat.com> | 2016-03-10 14:00:00 +0100 |
commit | 48146252c9130c1cc9eadbf09d0a80b841cbef72 (patch) | |
tree | 8d4f6a0f38499ebcf3f81a9a2224d42cb73398f8 /puppet/controller.yaml | |
parent | cab673943b64c591e55231fa57ed24505e80b82a (diff) |
Keystone domain for Heat
This patch adds support for configuring Keystone domain for Heat
via heat-keystone-setup-domain script. It should be reverted
as soon as Keystone v3 is fully functional.
This patch won't be fully functional without either python-keystoneclient
fix [1] or workaround [2].
[1] https://bugs.launchpad.net/python-keystoneclient/+bug/1452298
[2] https://review.openstack.org/180563
Change-Id: Ie9cdd518b299c141f0fdbb3441a7761c27321a88
Co-Authored-By: Jiri Stransky <jistr@redhat.com>
Depends-On: Ic541f11978908f9344e5590f3961f0d31c04bb0c
Diffstat (limited to 'puppet/controller.yaml')
-rw-r--r-- | puppet/controller.yaml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml index 186dce64..cf7b4030 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -238,7 +238,7 @@ parameters: type: string hidden: true HeatStackDomainAdminPassword: - description: Password for heat_domain_admin user. + description: Password for heat_stack_domain_admin user. type: string hidden: true HeatAuthEncryptionKey: @@ -1410,9 +1410,11 @@ resources: heat::debug: {get_input: debug} heat::db::mysql::password: {get_input: heat_password} heat_enable_db_purge: {get_input: heat_enable_db_purge} + heat::keystone::domain::domain_password: {get_input: heat_stack_domain_admin_password} # Keystone keystone::admin_token: {get_input: admin_token} + keystone::roles::admin::password: {get_input: admin_password} keystone_ca_certificate: {get_input: keystone_ca_certificate} keystone_signing_key: {get_input: keystone_signing_key} keystone_signing_certificate: {get_input: keystone_signing_certificate} |