From: Radoslaw Zarzynski Date: Mon, 25 Apr 2016 13:30:09 +0000 (+0200) Subject: rgw, doc: extend the documentation of rgw_keystone_admin_token. X-Git-Tag: v11.0.0~436^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7dbdddee8003817672c6bdaf83fcc0473e4fdb7a;p=ceph.git rgw, doc: extend the documentation of rgw_keystone_admin_token. Signed-off-by: Radoslaw Zarzynski --- diff --git a/doc/radosgw/config-ref.rst b/doc/radosgw/config-ref.rst index 28f5052e8391..f82ceaa5fe7a 100644 --- a/doc/radosgw/config-ref.rst +++ b/doc/radosgw/config-ref.rst @@ -982,7 +982,13 @@ Keystone Settings ``rgw keystone admin token`` -:Description: The Keystone admin token (shared secret). +:Description: The Keystone admin token (shared secret). In Ceph RadosGW + authentication with the admin token has priority over + authentication with the admin credentials + (``rgw keystone admin user``, ``rgw keystone admin password``, + ``rgw keystone admin tenant``, ``rgw keystone admin project``, + ``rgw keystone admin domain``). Admin token feature is considered + as deprecated. :Type: String :Default: None