Hello jenkins-bot, I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/335184 to review the following change. Change subject: Revert "Keystone: Turn on caching of tokens and catalog" ...................................................................... Revert "Keystone: Turn on caching of tokens and catalog" This didn't fix the one thing I wanted it to fix, and who the hell knows what else it might break... tonight keystone seemed to be handing expired or invalid tokens over to nova-api. This reverts commit 03f55287c8ee09f0f19d405f0a5dd63dcbe025d4. Change-Id: I38ee1c37a142fa1df7fab110d8b45ea2e8d2ca38 --- M modules/openstack/templates/liberty/keystone/keystone.conf.erb M modules/openstack/templates/mitaka/keystone/keystone.conf.erb 2 files changed, 2 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/84/335184/1 diff --git a/modules/openstack/templates/liberty/keystone/keystone.conf.erb b/modules/openstack/templates/liberty/keystone/keystone.conf.erb index 704aee9..6ab3924 100644 --- a/modules/openstack/templates/liberty/keystone/keystone.conf.erb +++ b/modules/openstack/templates/liberty/keystone/keystone.conf.erb @@ -305,7 +305,7 @@ # Global toggle for all caching using the should_cache_fn mechanism. (boolean # value) -enabled = true +#enabled = false # Extra debugging from the cache backend (cache keys, get/set/delete/etc # calls). This is only really useful if you need to see the specific cache- @@ -341,7 +341,6 @@ [catalog] # dynamic, sql-based backend (supports API/CLI-based management commands) driver = sql -caching = true # static, file-based backend (does *NOT* support any management commands) # driver = keystone.catalog.backends.templated.TemplatedCatalog @@ -351,8 +350,6 @@ [token] provider = uuid driver = sql -caching = true - # Amount of time a token should remain valid (in seconds) # Using 7.1 days, as we'll set MediaWiki to 7 days diff --git a/modules/openstack/templates/mitaka/keystone/keystone.conf.erb b/modules/openstack/templates/mitaka/keystone/keystone.conf.erb index 662e9b0..6ab3924 100644 --- a/modules/openstack/templates/mitaka/keystone/keystone.conf.erb +++ b/modules/openstack/templates/mitaka/keystone/keystone.conf.erb @@ -305,7 +305,7 @@ # Global toggle for all caching using the should_cache_fn mechanism. (boolean # value) -enabled = true +#enabled = false # Extra debugging from the cache backend (cache keys, get/set/delete/etc # calls). This is only really useful if you need to see the specific cache- @@ -341,7 +341,6 @@ [catalog] # dynamic, sql-based backend (supports API/CLI-based management commands) driver = sql -caching = true # static, file-based backend (does *NOT* support any management commands) # driver = keystone.catalog.backends.templated.TemplatedCatalog @@ -351,7 +350,6 @@ [token] provider = uuid driver = sql -caching = true # Amount of time a token should remain valid (in seconds) # Using 7.1 days, as we'll set MediaWiki to 7 days -- To view, visit https://gerrit.wikimedia.org/r/335184 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I38ee1c37a142fa1df7fab110d8b45ea2e8d2ca38 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits