diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-03-14 12:30:37 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-03-14 12:30:38 +0000 |
| commit | 31cb956bd4dc6bd08e7a3612798b4a939b326e93 (patch) | |
| tree | adbd5d555df4e1231bcd2abd7119059885935799 /puppet/controller.yaml | |
| parent | 312c0fac92698a01236c7170b6a9471fce8ba2b5 (diff) | |
| parent | 48146252c9130c1cc9eadbf09d0a80b841cbef72 (diff) | |
Merge "Keystone domain for Heat"
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 21551e35..9e9a7644 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} |