Ryan Lane has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/114435

Change subject: Add redis config to havana's keystone config file
......................................................................

Add redis config to havana's keystone config file

Change-Id: Id7599673710a5307d0ad73f84bef560ae702e534
---
M templates/openstack/havana/keystone/keystone.conf.erb
1 file changed, 9 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/35/114435/1

diff --git a/templates/openstack/havana/keystone/keystone.conf.erb 
b/templates/openstack/havana/keystone/keystone.conf.erb
index 56703c4..b1cc367 100644
--- a/templates/openstack/havana/keystone/keystone.conf.erb
+++ b/templates/openstack/havana/keystone/keystone.conf.erb
@@ -73,12 +73,21 @@
 # template_file = default_catalog.templates
 
 [token]
+<% if keystoneconfig["token_driver"] == 'redis' %>
+driver = keystoneredis.token.TokenNoList
+<% else %>
 driver = keystone.token.backends.sql.Token
+<% end %>
 
 # Amount of time a token should remain valid (in seconds)
 # Using 7.1 days, as we'll set MediaWiki to 7 days
 expiration = 613440
 
+<% if keystoneconfig["token_driver"] == 'redis' %>
+[redis]
+password = <%= keystoneconfig["token_driver_password"] %>
+<% end -%>
+
 [policy]
 driver = keystone.policy.backends.rules.Policy
 

-- 
To view, visit https://gerrit.wikimedia.org/r/114435
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id7599673710a5307d0ad73f84bef560ae702e534
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ryan Lane <rl...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to