diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/source/command-objects/network-meter-rule.rst | 6 | ||||
| -rw-r--r-- | doc/source/command-objects/server.rst | 9 | ||||
| -rw-r--r-- | doc/source/command-objects/volume-backup.rst | 10 |
3 files changed, 14 insertions, 11 deletions
diff --git a/doc/source/command-objects/network-meter-rule.rst b/doc/source/command-objects/network-meter-rule.rst index 83f8fd4f..22d50aa9 100644 --- a/doc/source/command-objects/network-meter-rule.rst +++ b/doc/source/command-objects/network-meter-rule.rst @@ -18,18 +18,16 @@ Create meter rule .. code:: bash openstack network meter rule create - [--project <project> [--project-domain <project-domain>]] + --remote-ip-prefix <remote-ip-prefix> [--ingress | --egress] [--exclude | --include] - --remote-ip-prefix <remote-ip-prefix> + [--project <project> [--project-domain <project-domain>]] <meter> .. option:: --project <project> Owner's project (name or ID) - *Network version 2 only* - .. option:: --project-domain <project-domain> Domain the project belongs to (name of ID). diff --git a/doc/source/command-objects/server.rst b/doc/source/command-objects/server.rst index f18d0918..a5d22f81 100644 --- a/doc/source/command-objects/server.rst +++ b/doc/source/command-objects/server.rst @@ -117,11 +117,16 @@ Create a new server .. option:: --image <image> - Create server from this image (name or ID) + Create server boot disk from this image (name or ID) .. option:: --volume <volume> - Create server from this volume (name or ID) + Create server using this volume as the boot disk (name or ID) + + This option automatically creates a block device mapping with a boot + index of 0. On many hypervisors (libvirt/kvm for example) this will + be device ``vda``. Do not create a duplicate mapping using + :option:`--block-device-mapping` for this volume. .. option:: --flavor <flavor> diff --git a/doc/source/command-objects/volume-backup.rst b/doc/source/command-objects/volume-backup.rst index 5e41e695..f2f814c5 100644 --- a/doc/source/command-objects/volume-backup.rst +++ b/doc/source/command-objects/volume-backup.rst @@ -101,26 +101,26 @@ List volume backups List additional fields in output -.. options:: --name <name> +.. option:: --name <name> Filters results by the backup name -.. options:: --status <status> +.. option:: --status <status> Filters results by the backup status ('creating', 'available', 'deleting', 'error', 'restoring' or 'error_restoring') -.. options:: --volume <volume> +.. option:: --volume <volume> Filters results by the volume which they backup (name or ID)" -.. options:: --marker <marker> +.. option:: --marker <marker> The last backup of the previous page (name or ID) *Volume version 2 only* -.. options:: --limit <limit> +.. option:: --limit <limit> Maximum number of backups to display |