summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-12-19 23:32:12 +0000
committerGerrit Code Review <review@openstack.org>2016-12-19 23:32:12 +0000
commitcc2c3f96b6b34b69ca735656b91e81b5c1653a29 (patch)
tree8bc67106d9f7816a5dfc0d2bbba026b9886dbb62
parenta788c006dfb22f22c84144188ae6adafda705a25 (diff)
parent997690ba3115a34518b7f32751b38842a76b7656 (diff)
Merge "Revert "Switch mistral to use authtoken configuration""
-rw-r--r--puppet/services/mistral-base.yaml6
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]}