summaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-12-19 18:46:25 +0000
committerGerrit Code Review <review@openstack.org>2016-12-19 18:46:25 +0000
commita788c006dfb22f22c84144188ae6adafda705a25 (patch)
tree06bd15e59475f5a9dd799afcb0bb6e84e6ab816f /puppet/services
parent299c30192535573f7f515a575f13782a1e8fdf82 (diff)
parented029e5bf279945e82bff8766af4093856a7ac6a (diff)
Merge "Switch mistral to use authtoken configuration"
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/mistral-base.yaml6
1 files changed, 4 insertions, 2 deletions
diff --git a/puppet/services/mistral-base.yaml b/puppet/services/mistral-base.yaml
index a11624c0..6a842a1e 100644
--- a/puppet/services/mistral-base.yaml
+++ b/puppet/services/mistral-base.yaml
@@ -70,8 +70,10 @@ outputs:
mistral::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
mistral::rabbit_port: {get_param: RabbitClientPort}
mistral::debug: {get_param: Debug}
- mistral::keystone_password: {get_param: MistralPassword}
- mistral::keystone_tenant: 'service'
+ 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::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]}