diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-04-30 14:09:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-04-30 14:09:58 +0000 |
| commit | 9ffe4ebb871d4267ce9f31cad77ee1f2db0080ac (patch) | |
| tree | cad16224b4daae01964ef75a1e153a00b3d7c5b9 /puppet/controller-puppet.yaml | |
| parent | 8d09036e0c2d39e79c279491e887083a365fd1ea (diff) | |
| parent | 7313930c22b9f18d67e630de084ffcc6fad5ebe7 (diff) | |
Merge "Keystone domain for Heat"
Diffstat (limited to 'puppet/controller-puppet.yaml')
| -rw-r--r-- | puppet/controller-puppet.yaml | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml index e9195912..80b790d5 100644 --- a/puppet/controller-puppet.yaml +++ b/puppet/controller-puppet.yaml @@ -154,9 +154,9 @@ parameters: type: string hidden: true HeatStackDomainAdminPassword: - description: Password for heat_domain_admin user. + default: unset + description: Password for heat_stack_domain_admin user. type: string - default: '' hidden: true HeatAuthEncryptionKey: description: Auth encryption key for heat-engine @@ -740,8 +740,13 @@ resources: heat::database_connection: {get_input: heat_dsn} heat::instance_user: heat-admin heat::debug: {get_input: debug} + # TO-DO: Remove this class as soon as Keystone v3 will be fully functional + heat::keystone::domain::auth_url: {list_join: ['', ['http://', {get_param: VirtualIP} , ':35357/v2.0']]} + heat::keystone::domain::keystone_password: {get_input: admin_password} + heat::keystone::domain::domain_password: {get_input: heat_stack_domain_admin_password} # Keystone + keystone::roles::admin::password: {get_input: admin_password} keystone::admin_token: {get_input: admin_token} keystone_ca_certificate: {get_input: keystone_ca_certificate} keystone_signing_key: {get_input: keystone_signing_key} |