update sources to v12.1.3

[ceph.git] / ceph / doc / radosgw / adminops.rst

diff --git a/ceph/doc/radosgw/adminops.rst b/ceph/doc/radosgw/adminops.rst
index 28c02164b0d84749afd3c3194d4ccaeb5abb15d7..422dd16527a446264c2cbbad123d792b4b2d9f6e 100644 (file)
--- a/ceph/doc/radosgw/adminops.rst
+++ b/ceph/doc/radosgw/adminops.rst
@@ -321,6 +321,11 @@ generated key is added to the keyring without replacing an existing key pair.
 If ``access-key`` is specified and refers to an existing key owned by the user
 then it will be modified.
 
+.. versionadded:: Luminous
+
+A ``tenant`` may either be specified as a part of uid or as an additional
+request param.
+
 :caps: users=write
 
 Syntax
@@ -342,6 +347,7 @@ Request Parameters
 :Type: String
 :Example: ``foo_user``
 :Required: Yes
+A tenant name may also specified as a part of ``uid``, by following the syntax ``tenant$user``, refer to `Multitenancy`_ for more details.
 
 ``display-name``
 
@@ -408,6 +414,14 @@ Request Parameters
 :Example: False [False]
 :Required: No
 
+.. versionadded:: Jewel
+``tenant``
+
+:Description: the Tenant under which a user is a part of.
+:Type: string
+:Example: tenant1
+:Required: No
+
 Response Entities
 ~~~~~~~~~~~~~~~~~
 
@@ -418,6 +432,11 @@ If successful, the response contains the user information.
 :Description: A container for the user data information.
 :Type: Container
 
+``tenant``
+:Description: The tenant which user is a part of
+:Type: String
+:Parent: ``user``
+
 ``user_id``
 
 :Description: The user id.
@@ -1924,3 +1943,4 @@ Standard Error Responses
 
 .. _Admin Guide: ../admin
 .. _Quota Management: ../admin#quota-management
+.. _Multitenancy: ./multitenancy