diff --git a/ceph-client/values.yaml b/ceph-client/values.yaml
index 144388e9c8..6fd6e35a97 100644
--- a/ceph-client/values.yaml
+++ b/ceph-client/values.yaml
@@ -303,6 +303,8 @@ conf:
       rgw_s3_auth_use_keystone: true
       rgw_swift_account_in_url: true
       rgw_swift_url: null
+      #NOTE (portdirect): See http://tracker.ceph.com/issues/21226
+      rgw_keystone_token_cache_size: 0
   ceph:
     global:
       # auth