Merge "[performance] Disable keystone token revoke" into stable/colorado

1 files changed, 44 insertions, 0 deletions

diff --git a/build/patch-repos/build/repos/fuel-library/0001-Disable-token-revoke-to-increase-keystone-performanc.patch b/build/patch-repos/build/repos/fuel-library/0001-Disable-token-revoke-to-increase-keystone-performanc.patch
new file mode 100644
index 000000000..4d5be493b
--- /dev/null
+++ b/build/patch-repos/build/repos/fuel-library/0001-Disable-token-revoke-to-increase-keystone-performanc.patch
@@ -0,0 +1,44 @@
+From ba542dde34743b276547b7ca3c6591feb9000877 Mon Sep 17 00:00:00 2001
+From: iberezovskiy <iberezovskiy@mirantis.com>
+Date: Mon, 19 Sep 2016 12:35:05 +0300
+Subject: [PATCH] Disable token revoke to increase keystone performance
+
+Change-Id: I4df816369093908ad1eac372f38c92155efbe8e0
+Closes-bug: #1625077
+---
+ .../openstack_tasks/manifests/keystone/keystone.pp |    2 ++
+ tests/noop/spec/hosts/keystone/keystone_spec.rb    |    5 +++++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/deployment/puppet/openstack_tasks/manifests/keystone/keystone.pp b/deployment/puppet/openstack_tasks/manifests/keystone/keystone.pp
+index 3162287..ba9d7df 100644
+--- a/deployment/puppet/openstack_tasks/manifests/keystone/keystone.pp
++++ b/deployment/puppet/openstack_tasks/manifests/keystone/keystone.pp
+@@ -327,6 +327,8 @@ class openstack_tasks::keystone::keystone {
+       memcache_pool_unused_timeout => '60',
+       cache_memcache_servers       => $memcache_servers,
+       policy_driver                => 'keystone.policy.backends.sql.Policy',
++      # Set revoke_by_id to false according to LP #1625077
++      revoke_by_id                 => false,
+     }
+ 
+     Package<| title == 'keystone'|> ~> Service<| title == 'keystone'|>
+diff --git a/tests/noop/spec/hosts/keystone/keystone_spec.rb b/tests/noop/spec/hosts/keystone/keystone_spec.rb
+index b29e691..3c0f847 100644
+--- a/tests/noop/spec/hosts/keystone/keystone_spec.rb
++++ b/tests/noop/spec/hosts/keystone/keystone_spec.rb
+@@ -176,6 +176,11 @@ describe manifest do
+         should contain_class('keystone').with('sync_db' => primary_controller)
+     end
+ 
++    it 'should declare keystone class with revoke_by_id set to false' do
++      # Set revoke_by_id to false according to LP #1625077
++      should contain_class('keystone').with('revoke_by_id' => false)
++    end
++
+     it 'should configure keystone with paramters' do
+       should contain_keystone_config('token/caching').with(:value => 'false')
+       should contain_keystone_config('cache/enabled').with(:value => 'true')
+-- 
+1.7.9.5
+