diff options
Diffstat (limited to 'doc/source/command-objects')
| -rw-r--r-- | doc/source/command-objects/availability-zone.rst | 12 | ||||
| -rw-r--r-- | doc/source/command-objects/image.rst | 39 | ||||
| -rw-r--r-- | doc/source/command-objects/network.rst | 6 | ||||
| -rw-r--r-- | doc/source/command-objects/port.rst | 21 | ||||
| -rw-r--r-- | doc/source/command-objects/server.rst | 5 | ||||
| -rw-r--r-- | doc/source/command-objects/subnet.rst | 20 |
6 files changed, 88 insertions, 15 deletions
diff --git a/doc/source/command-objects/availability-zone.rst b/doc/source/command-objects/availability-zone.rst index 37435230..8c021529 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 +Compute v2, Block Storage v2 availability zone list ---------------------- @@ -13,8 +13,18 @@ List availability zones and their status .. code:: bash os availability zone list + [--compute] + [--volume] [--long] +.. option:: --compute + + List compute availability zones + +.. option:: --volume + + List volume availability zones + .. option:: --long List additional fields in output diff --git a/doc/source/command-objects/image.rst b/doc/source/command-objects/image.rst index f1893efa..61872ec4 100644 --- a/doc/source/command-objects/image.rst +++ b/doc/source/command-objects/image.rst @@ -19,7 +19,6 @@ Create/upload an image [--store <store>] [--container-format <container-format>] [--disk-format <disk-format>] - [--owner <project>] [--size <size>] [--min-disk <disk-gb>] [--min-ram <ram-mb>] @@ -33,7 +32,7 @@ Create/upload an image [--public | --private] [--property <key=value> [...] ] [--tag <tag> [...] ] - [--project-domain <project-domain>] + [--project <project> [--project-domain <project-domain>]] <image-name> .. option:: --id <id> @@ -54,10 +53,6 @@ Create/upload an image Image disk format (default: raw) -.. option:: --owner <project> - - Image owner project name or ID - .. option:: --size <size> Image size, in bytes (only used with --location and --copy-from) @@ -128,11 +123,18 @@ Create/upload an image .. versionadded:: 2 +.. option:: --project <project> + + Set an alternate project on this image (name or ID). + Previously known as `--owner`. + .. option:: --project-domain <project-domain> Domain the project belongs to (name or ID). This can be used in case collisions between project names exist. + .. versionadded:: 2 + .. describe:: <image-name> New image name @@ -165,6 +167,8 @@ List available images [--property <key=value>] [--long] [--sort <key>[:<direction>]] + [--limit <limit>] + [--marker <marker>] .. option:: --public @@ -193,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 ---------- @@ -225,7 +238,6 @@ Set image properties os image set [--name <name>] - [--owner <project>] [--min-disk <disk-gb>] [--min-ram <disk-ram>] [--container-format <container-format>] @@ -250,17 +262,13 @@ Set image properties [--os-version <os-version>] [--ramdisk-id <ramdisk-id>] [--activate|--deactivate] - [--project-domain <project-domain>] + [--project <project> [--project-domain <project-domain>]] <image> .. option:: --name <name> New image name -.. option:: --owner <project> - - New image owner project (name or ID) - .. option:: --min-disk <disk-gb> Minimum disk size needed to boot image, in gigabytes @@ -407,11 +415,18 @@ Set image properties .. versionadded:: 2 +.. option:: --project <project> + + Set an alternate project on this image (name or ID). + Previously known as `--owner`. + .. option:: --project-domain <project-domain> Domain the project belongs to (name or ID). This can be used in case collisions between project names exist. + .. versionadded:: 2 + .. describe:: <image> Image to modify (name or ID) diff --git a/doc/source/command-objects/network.rst b/doc/source/command-objects/network.rst index 7c791840..bb366672 100644 --- a/doc/source/command-objects/network.rst +++ b/doc/source/command-objects/network.rst @@ -16,6 +16,7 @@ Create new network [--project <project> [--project-domain <project-domain>]] [--enable | --disable] [--share | --no-share] + [--availability-zone-hint <availability-zone>] <name> .. option:: --project <project> @@ -43,6 +44,11 @@ Create new network Do not share the network between projects +.. option:: --availability-zone-hint <availability-zone> + + Availability Zone in which to create this network (requires the Network + Availability Zone extension, this option can be repeated). + .. _network_create-name: .. describe:: <name> diff --git a/doc/source/command-objects/port.rst b/doc/source/command-objects/port.rst new file mode 100644 index 00000000..78677332 --- /dev/null +++ b/doc/source/command-objects/port.rst @@ -0,0 +1,21 @@ +==== +port +==== + +Network v2 + +port delete +----------- + +Delete port(s) + +.. program:: port delete +.. code:: bash + + os port delete + <port> [<port> ...] + +.. _port_delete-port: +.. describe:: <port> + + Port(s) to delete (name or ID) diff --git a/doc/source/command-objects/server.rst b/doc/source/command-objects/server.rst index fd487b8e..fc275971 100644 --- a/doc/source/command-objects/server.rst +++ b/doc/source/command-objects/server.rst @@ -375,14 +375,15 @@ Rebuild server .. code:: bash os server rebuild - --image <image> + [--image <image>] [--password <password>] [--wait] <server> .. option:: --image <image> - Recreate server from this image + Recreate server from the specified image (name or ID). Defaults to the + currently used one. .. option:: --password <password> diff --git a/doc/source/command-objects/subnet.rst b/doc/source/command-objects/subnet.rst new file mode 100644 index 00000000..70a0eedf --- /dev/null +++ b/doc/source/command-objects/subnet.rst @@ -0,0 +1,20 @@ +====== +subnet +====== + +Network v2 + +subnet list +----------- + +List subnets + +.. program:: subnet list +.. code:: bash + + os subnet list + [--long] + +.. option:: --long + + List additional fields in output |