summaryrefslogtreecommitdiffstats
path: root/puppet/controller-puppet.yaml
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2015-05-01 12:22:31 -0400
committerDan Prince <dprince@redhat.com>2015-05-01 12:23:40 -0400
commit0ef982864d85890acd061cc4fe31eb9b5320ade5 (patch)
tree52a281342572f8f0dbf7e8595b67345f94ed6f2d /puppet/controller-puppet.yaml
parent9ffe4ebb871d4267ce9f31cad77ee1f2db0080ac (diff)
Revert "Keystone domain for Heat"
This reverts commit 7313930c22b9f18d67e630de084ffcc6fad5ebe7. Seeing errors when trying to create the keystone admin role with packages. (ImportError: No module named os_client_config) Change-Id: I78796598ccb8d2ffd6bfca85dce7d18dc0fd768e Related-bug: #1450786
Diffstat (limited to 'puppet/controller-puppet.yaml')
-rw-r--r--puppet/controller-puppet.yaml9
1 files changed, 2 insertions, 7 deletions
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml
index 80b790d5..e9195912 100644
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@ -154,9 +154,9 @@ parameters:
type: string
hidden: true
HeatStackDomainAdminPassword:
- default: unset
- description: Password for heat_stack_domain_admin user.
+ description: Password for heat_domain_admin user.
type: string
+ default: ''
hidden: true
HeatAuthEncryptionKey:
description: Auth encryption key for heat-engine
@@ -740,13 +740,8 @@ 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}