diff options
Diffstat (limited to 'doc/man')
| -rw-r--r-- | doc/man/8/cephadm.rst | 23 | ||||
| -rw-r--r-- | doc/man/8/radosgw-admin.rst | 7 | ||||
| -rw-r--r-- | doc/man/8/rbd.rst | 9 |
3 files changed, 37 insertions, 2 deletions
diff --git a/doc/man/8/cephadm.rst b/doc/man/8/cephadm.rst index 0847066b66d..3c23a9867f7 100644 --- a/doc/man/8/cephadm.rst +++ b/doc/man/8/cephadm.rst @@ -13,7 +13,7 @@ Synopsis | [--log-dir LOG_DIR] [--logrotate-dir LOGROTATE_DIR] | [--unit-dir UNIT_DIR] [--verbose] [--timeout TIMEOUT] | [--retry RETRY] [--no-container-init] -| {version,pull,inspect-image,ls,list-networks,adopt,rm-daemon,rm-cluster,run,shell,enter,ceph-volume,unit,logs,bootstrap,deploy,check-host,prepare-host,add-repo,rm-repo,install} +| {version,pull,inspect-image,ls,list-networks,adopt,rm-daemon,rm-cluster,run,shell,enter,ceph-volume,unit,logs,bootstrap,deploy,check-host,prepare-host,add-repo,rm-repo,install,list-images,update-osd-service} | ... @@ -104,6 +104,9 @@ Synopsis | [--registry-password REGISTRY_PASSWORD] | [--registry-json REGISTRY_JSON] [--fsid FSID] +| **cephadm** **list-images** + +| **cephadm** **update-osd-service** [-h] [--fsid FSID] --osd-ids OSD_IDS --service-name SERVICE_NAME Description @@ -527,6 +530,24 @@ Arguments: * [--name NAME, -n NAME] daemon name (type.id) +list-images +----------- + +List the default container images for all services in ini format. The output can be modified with custom images and passed to --config flag during bootstrap. + + +update-osd-service +------------------ + +Update the OSD service for specific OSDs + +Arguments: + +* [--fsid FSID] cluster FSID +* --osd-ids OSD_IDS Comma-separated OSD IDs +* --service-name SERVICE_NAME OSD service name + + Availability ============ diff --git a/doc/man/8/radosgw-admin.rst b/doc/man/8/radosgw-admin.rst index c7750c348ad..3cd4338a5ec 100644 --- a/doc/man/8/radosgw-admin.rst +++ b/doc/man/8/radosgw-admin.rst @@ -541,6 +541,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/man/8/rbd.rst b/doc/man/8/rbd.rst index 492dad652d2..6956b9e334b 100644 --- a/doc/man/8/rbd.rst +++ b/doc/man/8/rbd.rst @@ -576,7 +576,11 @@ Commands details for every mirror-enabled image in the pool or namespace. :command:`mirror snapshot schedule add` [-p | --pool *pool*] [--namespace *namespace*] [--image *image*] *interval* [*start-time*] - Add mirror snapshot schedule. + Add mirror snapshot schedule. The ``interval`` can be specified in + days, hours, or minutes using the d, h, m suffix respectively. + The ``start-time`` is a time string in ISO 8601 format. Not providing the + ``--pool``, ``--namespace`` and ``--image`` options creates a global + schedule which applies to all mirror-enabled images in the cluster. :command:`mirror snapshot schedule list` [-R | --recursive] [--format *format*] [--pretty-format] [-p | --pool *pool*] [--namespace *namespace*] [--image *image*] List mirror snapshot schedule. @@ -1031,6 +1035,9 @@ To restore an image from trash and rename it:: rbd trash restore mypool/myimage-id --image mynewimage +To create a mirror snapshot schedule for an image:: + + rbd mirror snapshot schedule add --pool mypool --image myimage 12h 14:00:00-05:00 Availability ============ |