diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/source/command-objects/availability-zone.rst | 7 | ||||
| -rw-r--r-- | doc/source/command-objects/image.rst | 11 | ||||
| -rw-r--r-- | doc/source/command-objects/port.rst | 16 | ||||
| -rw-r--r-- | doc/source/command-objects/router.rst | 6 | ||||
| -rw-r--r-- | doc/source/command-objects/security-group-rule.rst | 2 | ||||
| -rw-r--r-- | doc/source/command-objects/security-group.rst | 2 | ||||
| -rw-r--r-- | doc/source/command-options.rst | 2 | ||||
| -rw-r--r-- | doc/source/commands.rst | 2 |
8 files changed, 43 insertions, 5 deletions
diff --git a/doc/source/command-objects/availability-zone.rst b/doc/source/command-objects/availability-zone.rst index 8c021529..1f568438 100644 --- a/doc/source/command-objects/availability-zone.rst +++ b/doc/source/command-objects/availability-zone.rst @@ -2,7 +2,7 @@ availability zone ================= -Compute v2, Block Storage v2 +Block Storage v2, Compute v2, Network v2 availability zone list ---------------------- @@ -14,6 +14,7 @@ List availability zones and their status os availability zone list [--compute] + [--network] [--volume] [--long] @@ -21,6 +22,10 @@ List availability zones and their status List compute availability zones +.. option:: --network + + List network availability zones + .. option:: --volume List volume availability zones diff --git a/doc/source/command-objects/image.rst b/doc/source/command-objects/image.rst index 15286760..61872ec4 100644 --- a/doc/source/command-objects/image.rst +++ b/doc/source/command-objects/image.rst @@ -167,6 +167,8 @@ List available images [--property <key=value>] [--long] [--sort <key>[:<direction>]] + [--limit <limit>] + [--marker <marker>] .. option:: --public @@ -195,6 +197,15 @@ List available images Sort output by selected keys and directions(asc or desc) (default: asc), multiple keys and directions can be specified separated by comma +.. option:: --limit <limit> + + Maximum number of images to display. + +.. option:: --marker <marker> + + The last image (name or ID) of the previous page. Display list of images + after marker. Display all images if not specified. + image save ---------- diff --git a/doc/source/command-objects/port.rst b/doc/source/command-objects/port.rst index 78677332..414b7437 100644 --- a/doc/source/command-objects/port.rst +++ b/doc/source/command-objects/port.rst @@ -19,3 +19,19 @@ Delete port(s) .. describe:: <port> Port(s) to delete (name or ID) + +port show +--------- + +Display port details + +.. program:: port show +.. code:: bash + + os port show + <port> + +.. _port_show-port: +.. describe:: <port> + + Port to display (name or ID) diff --git a/doc/source/command-objects/router.rst b/doc/source/command-objects/router.rst index e881065d..2a5bf053 100644 --- a/doc/source/command-objects/router.rst +++ b/doc/source/command-objects/router.rst @@ -16,6 +16,7 @@ Create new router [--project <project> [--project-domain <project-domain>]] [--enable | --disable] [--distributed] + [--availability-zone-hint <availability-zone>] <name> .. option:: --project <project> @@ -39,6 +40,11 @@ Create new router Create a distributed router +.. option:: --availability-zone-hint <availability-zone> + + Availability Zone in which to create this router (requires the Router + Availability Zone extension, this option can be repeated). + .. _router_create-name: .. describe:: <name> diff --git a/doc/source/command-objects/security-group-rule.rst b/doc/source/command-objects/security-group-rule.rst index ec03644e..50bc64aa 100644 --- a/doc/source/command-objects/security-group-rule.rst +++ b/doc/source/command-objects/security-group-rule.rst @@ -2,7 +2,7 @@ security group rule =================== -Compute v2 +Compute v2, Network v2 security group rule create -------------------------- diff --git a/doc/source/command-objects/security-group.rst b/doc/source/command-objects/security-group.rst index 60de41d8..cf86bda6 100644 --- a/doc/source/command-objects/security-group.rst +++ b/doc/source/command-objects/security-group.rst @@ -2,7 +2,7 @@ security group ============== -Compute v2 +Compute v2, Network v2 security group create --------------------- diff --git a/doc/source/command-options.rst b/doc/source/command-options.rst index edafb153..458c56bb 100644 --- a/doc/source/command-options.rst +++ b/doc/source/command-options.rst @@ -19,7 +19,7 @@ Boolean Options Boolean options for any command that sets a resource state, such as 'enabled' or 'public', shall always have both positive and negative options defined. -The names of those options shall either be a naturally occuring pair of +The names of those options shall either be a naturally occurring pair of words (in English) or a positive option and a negative option with `no-` prepended (such as in the traditional GNU option usage) like `--share` and `--no-share`. diff --git a/doc/source/commands.rst b/doc/source/commands.rst index f5484b21..1c4f84b2 100644 --- a/doc/source/commands.rst +++ b/doc/source/commands.rst @@ -70,7 +70,7 @@ the API resources will be merged, as in the ``quota`` object that has options referring to both Compute and Volume quotas. * ``access token``: (**Identity**) long-lived OAuth-based token -* ``availability zone``: (**Compute**, **Volume**) a logical partition of hosts or block storage services +* ``availability zone``: (**Compute**, **Network**, **Volume**) a logical partition of hosts or block storage or network services * ``aggregate``: (**Compute**) a grouping of servers * ``backup``: (**Volume**) a volume copy * ``catalog``: (**Identity**) service catalog |