summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/man/8/radosgw-admin.rst7
-rw-r--r--doc/radosgw/admin.rst1
2 files changed, 8 insertions, 0 deletions
diff --git a/doc/man/8/radosgw-admin.rst b/doc/man/8/radosgw-admin.rst
index 7dfa59a61b1..9ef13e0f783 100644
--- a/doc/man/8/radosgw-admin.rst
+++ b/doc/man/8/radosgw-admin.rst
@@ -548,6 +548,13 @@ Options
Generate random secret key.
+.. option:: --generate-key
+
+ create user with or without credentials.
+ If this option set to false, then user cannot set --gen-access-key/--gen-secret/--secret-key/--access-key.
+ If this option set to true, then user cannot set --secret-key/--access-key and bypass options for --gen-secret/--gen-access-key.
+ Default is true.
+
.. option:: --key-type=<type>
Key type, options are: swift, s3.
diff --git a/doc/radosgw/admin.rst b/doc/radosgw/admin.rst
index 7c7d9d6df14..8dbf8c10b04 100644
--- a/doc/radosgw/admin.rst
+++ b/doc/radosgw/admin.rst
@@ -262,6 +262,7 @@ include:
- ``--secret-key=<key>`` manually specifies a S3 secret key or a Swift secret key.
- ``--gen-access-key`` automatically generates a random S3 access key.
- ``--gen-secret`` automatically generates a random S3 secret key or a random Swift secret key.
+- ``--generate-key`` create user with or without credentials. If sets to false, then user cannot set ``gen-secret/gen-access-key/access-key/secret-key``
Adding S3 keys
~~~~~~~~~~~~~~