From: zdover23 <1445107+zdover23@users.noreply.github.com>
Date: Sat, 30 Jul 2022 10:06:37 +0000 (+1000)
Subject: Merge branch 'quincy' into wip-doc-2022-07-28-backport-46024-to-quincy
X-Git-Tag: v17.2.6~512^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=179d55b3d0c3a017f170a57545cdcf47d4d75a68;p=ceph.git

Merge branch 'quincy' into wip-doc-2022-07-28-backport-46024-to-quincy
---

179d55b3d0c3a017f170a57545cdcf47d4d75a68
diff --cc doc/radosgw/STS.rst
index 12a5f5eb8498,f0729680b7d5..de48bd35ec8b
--- a/doc/radosgw/STS.rst
+++ b/doc/radosgw/STS.rst
@@@ -104,17 -101,21 +104,26 @@@ Notes
  
  Examples
  ========
 +1. In order to get the example to work, make sure that the user TESTER has the ``roles`` capability assigned:
 +
 +.. code-block:: console
  
 -1. The following is an example of AssumeRole API call, which shows steps to create a role, assign a policy to it
 -(that allows access to S3 resources), assuming a role to get temporary credentials and accessing s3 resources using
 -those credentials. In this example, TESTER1 assumes a role created by TESTER, to access S3 resources owned by TESTER,
 -according to the permission policy attached to the role.
 +   radosgw-admin caps add --uid="TESTER" --caps="roles=*"
 +
 +2. The following is an example of AssumeRole API call, which shows steps to create a role, assign a policy to it
 +   (that allows access to S3 resources), assuming a role to get temporary credentials and accessing s3 resources using
 +   those credentials. In this example, TESTER1 assumes a role created by TESTER, to access S3 resources owned by TESTER,
 +   according to the permission policy attached to the role.
  
+ .. code-block:: console
+ 
+    radosgw-admin caps add --uid="TESTER" --caps="roles=*"
+ 
+ 2. The following is an example of the AssumeRole API call, which shows steps to create a role, assign a policy to it
+    (that allows access to S3 resources), assuming a role to get temporary credentials and accessing S3 resources using
+    those credentials. In this example, TESTER1 assumes a role created by TESTER, to access S3 resources owned by TESTER,
+    according to the permission policy attached to the role.
+ 
  .. code-block:: python
  
      import boto3