From: Abhishek Lekshmanan <abhishek@suse.com>
Date: Tue, 12 Jan 2016 09:43:46 +0000 (+0100)
Subject: doc: update keystone admin options in config-ref
X-Git-Tag: v11.0.0~753^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F7193%2Fhead;p=ceph.git

doc: update keystone admin options in config-ref

Adding the short descriptions of the keystone admin tenant, user and
password options to the config reference as well. Also adding a note
that this applies to only v2 of Openstack Identity API

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
---

diff --git a/doc/radosgw/config-ref.rst b/doc/radosgw/config-ref.rst
index 8bd24756eee..3ea0380f5c6 100644
--- a/doc/radosgw/config-ref.rst
+++ b/doc/radosgw/config-ref.rst
@@ -962,6 +962,28 @@ Keystone Settings
 :Default: None
 
 
+``rgw keystone admin tenant``
+
+:Description: The name of OpenStack tenant with admin privilege (Service Tenant) when
+              using OpenStack Identity API v2
+:Type: String
+:Default: None
+
+
+``rgw keystone admin user``
+:Description: The name of OpenStack user with admin privilege for Keystone
+              authentication (Service User) when OpenStack Identity API v2
+:Type: String
+:Default: None
+
+
+``rgw keystone admin password``
+:Description: The password for OpenStack admin user when using OpenStack
+              Identity API v2
+:Type: String
+:Default: None
+
+
 ``rgw keystone accepted roles``
 
 :Description: The roles requires to serve requests.