diff options
| author |   Ben Nemec <openstack@nemebean.com> | 2016-12-19 20:34:46 +0000 |
|---|---|---|
| committer | Ben Nemec <openstack@nemebean.com> | 2016-12-19 20:34:46 +0000 |
| commit | 997690ba3115a34518b7f32751b38842a76b7656 (patch) | |
| tree | c6c0ca3b1e836692e0a367f2fa27ba3646c75fa7 | |
| parent | ed029e5bf279945e82bff8766af4093856a7ac6a (diff) | |
Revert "Switch mistral to use authtoken configuration"
It turns out the puppet-mistral change this depends on broke
introspection, so we need to back it out for now.
This reverts commit ed029e5bf279945e82bff8766af4093856a7ac6a.
Change-Id: I828478267935cdc68aa24de8c9dc2d12fcadb631
| -rw-r--r-- | puppet/services/mistral-base.yaml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/puppet/services/mistral-base.yaml b/puppet/services/mistral-base.yaml index 6a842a1e..a11624c0 100644 --- a/puppet/services/mistral-base.yaml +++ b/puppet/services/mistral-base.yaml @@ -70,10 +70,8 @@ outputs: mistral::rabbit_use_ssl: {get_param: RabbitClientUseSSL} mistral::rabbit_port: {get_param: RabbitClientPort} mistral::debug: {get_param: Debug} - mistral::keystone::authtoken::project_name: 'service' - mistral::keystone::authtoken::password: {get_param: MistralPassword} - mistral::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] } - mistral::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]} + mistral::keystone_password: {get_param: MistralPassword} + mistral::keystone_tenant: 'service' mistral::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]} mistral::keystone_ec2_uri: {get_param: [EndpointMap, KeystoneEC2, uri]} mistral::identity_uri: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]} |