diff options
Diffstat (limited to 'doc/source/command-objects')
| -rw-r--r-- | doc/source/command-objects/aggregate.rst | 2 | ||||
| -rw-r--r-- | doc/source/command-objects/compute-service.rst | 10 | ||||
| -rw-r--r-- | doc/source/command-objects/ip-floating.rst | 30 | ||||
| -rw-r--r-- | doc/source/command-objects/security-group-rule.rst | 5 | ||||
| -rw-r--r-- | doc/source/command-objects/subnet.rst | 93 | ||||
| -rw-r--r-- | doc/source/command-objects/volume-type.rst | 27 | ||||
| -rw-r--r-- | doc/source/command-objects/volume.rst | 82 |
7 files changed, 186 insertions, 63 deletions
diff --git a/doc/source/command-objects/aggregate.rst b/doc/source/command-objects/aggregate.rst index be403179..6c4baa53 100644 --- a/doc/source/command-objects/aggregate.rst +++ b/doc/source/command-objects/aggregate.rst @@ -2,7 +2,7 @@ aggregate ========= -Server aggregates provide a mechanism to group servers according to certain +Host aggregates provide a mechanism to group hosts according to certain criteria. Compute v2 diff --git a/doc/source/command-objects/compute-service.rst b/doc/source/command-objects/compute-service.rst index aefe55db..db75bef4 100644 --- a/doc/source/command-objects/compute-service.rst +++ b/doc/source/command-objects/compute-service.rst @@ -34,15 +34,15 @@ List service command [--long] .. _compute-service-list: -.. describe:: --host <host> +.. option:: --host <host> - Name of host + List services on specified host (name only) -.. describe:: --service <service> +.. option:: --service <service> - Name of service + List only specified service (name only) -.. describe:: --long +.. option:: --long List additional fields in output diff --git a/doc/source/command-objects/ip-floating.rst b/doc/source/command-objects/ip-floating.rst index 05e4a132..869b7af8 100644 --- a/doc/source/command-objects/ip-floating.rst +++ b/doc/source/command-objects/ip-floating.rst @@ -33,11 +33,35 @@ Create new floating IP address .. code:: bash os ip floating create - <pool> + [--subnet <subnet>] + [--port <port>] + [--floating-ip-address <floating-ip-address>] + [--fixed-ip-address <fixed-ip-address>] + <network> -.. describe:: <pool> +.. option:: --subnet <subnet> - Pool to fetch IP address from (name or ID) + Subnet on which you want to create the floating IP (name or ID) + (Network v2 only) + +.. option:: --port <port> + + Port to be associated with the floating IP (name or ID) + (Network v2 only) + +.. option:: --floating-ip-address <floating-ip-address> + + Floating IP address + (Network v2 only) + +.. option:: --fixed-ip-address <fixed-ip-address> + + Fixed IP address mapped to the floating IP + (Network v2 only) + +.. describe:: <network> + + Network to allocate floating IP from (name or ID) ip floating delete ------------------ diff --git a/doc/source/command-objects/security-group-rule.rst b/doc/source/command-objects/security-group-rule.rst index 58e7a0a5..fa07c377 100644 --- a/doc/source/command-objects/security-group-rule.rst +++ b/doc/source/command-objects/security-group-rule.rst @@ -28,11 +28,12 @@ Create a new security group rule .. option:: --src-group <group> - Source security group (ID only) + Source security group (name or ID) .. option:: --dst-port <port-range> - Destination port, may be a range: 137:139 (default: 0; only required for proto tcp and udp) + Destination port, may be a single port or port range: 137:139 + (only required for IP protocols tcp and udp) .. describe:: <group> diff --git a/doc/source/command-objects/subnet.rst b/doc/source/command-objects/subnet.rst index 56a28d73..e81a3359 100644 --- a/doc/source/command-objects/subnet.rst +++ b/doc/source/command-objects/subnet.rst @@ -4,24 +4,8 @@ subnet Network v2 -subnet delete -------------- - -Delete a subnet - -.. program:: subnet delete -.. code:: bash - - os subnet delete - <subnet> - -.. _subnet_delete-subnet: -.. describe:: <subnet> - - Subnet to delete (name or ID) - subnet create --------------- +------------- Create new subnet @@ -128,6 +112,22 @@ Create new subnet Name of subnet to create +subnet delete +------------- + +Delete a subnet + +.. program:: subnet delete +.. code:: bash + + os subnet delete + <subnet> + +.. _subnet_delete-subnet: +.. describe:: <subnet> + + Subnet to delete (name or ID) + subnet list ----------- @@ -143,6 +143,65 @@ List subnets List additional fields in output +subnet set +---------- + +Set subnet properties + +.. program:: subnet set +.. code:: bash + + os subnet set + [--allocation-pool start=<ip-address>,end=<ip-address>] + [--dhcp | --no-dhcp] + [--dns-nameserver <dns-nameserver>] + [--gateway <gateway-ip>] + [--host-route destination=<subnet>,gateway=<ip-address>] + [--name <new-name>] + <subnet> + +.. option:: --allocation-pool start=<ip-address>,end=<ip-address> + + Allocation pool IP addresses for this subnet e.g.: + start=192.168.199.2,end=192.168.199.254 (This option can be repeated) + +.. option:: --dhcp + + Enable DHCP + +.. option:: --no-dhcp + + Disable DHCP + +.. option:: --dns-nameserver <dns-nameserver> + + DNS name server for this subnet (This option can be repeated) + +.. option:: --gateway <gateway> + + Specify a gateway for the subnet. The options are: + <ip-address>: Specific IP address to use as the gateway + 'none': This subnet will not use a gateway + e.g.: --gateway 192.168.9.1, --gateway none + +.. option:: --host-route destination=<subnet>,gateway=<ip-address> + + Additional route for this subnet e.g.: + destination=10.10.0.0/16,gateway=192.168.71.254 + destination: destination subnet (in CIDR notation) + gateway: nexthop IP address + (This option can be repeated) + +.. option:: --name + + Updated name of the subnet + +.. _subnet_set-subnet: +.. describe:: <subnet> + + Subnet to modify (name or ID) + + subnet show ----------- diff --git a/doc/source/command-objects/volume-type.rst b/doc/source/command-objects/volume-type.rst index 8a113847..69944fb9 100644 --- a/doc/source/command-objects/volume-type.rst +++ b/doc/source/command-objects/volume-type.rst @@ -20,7 +20,7 @@ Create new volume type .. option:: --description <description> - New volume type description + Volume type description .. versionadded:: 2 @@ -40,9 +40,10 @@ Create new volume type Set a property on this volume type (repeat option to set multiple properties) +.. _volume_type_create-name: .. describe:: <name> - New volume type name + Volume type name volume type delete ------------------ @@ -55,6 +56,7 @@ Delete volume type os volume type delete <volume-type> +.. _volume_type_delete-volume-type: .. describe:: <volume-type> Volume type to delete (name or ID) @@ -102,12 +104,30 @@ Set volume type properties .. option:: --property <key=value> - Property to add or modify for this volume type (repeat option to set multiple properties) + Set a property on this volume type (repeat option to set multiple properties) +.. _volume_type_set-volume-type: .. describe:: <volume-type> Volume type to modify (name or ID) +volume type show +---------------- + +Display volume type details + + +.. program:: volume type show +.. code:: bash + + os volume type show + <volume-type> + +.. _volume_type_show-volume-type: +.. describe:: <volume-type> + + Volume type to display (name or ID) + volume type unset ----------------- @@ -124,6 +144,7 @@ Unset volume type properties Property to remove from volume type (repeat option to remove multiple properties) +.. _volume_type_unset-volume-type: .. describe:: <volume-type> Volume type to modify (name or ID) diff --git a/doc/source/command-objects/volume.rst b/doc/source/command-objects/volume.rst index fd32c327..a51d1117 100644 --- a/doc/source/command-objects/volume.rst +++ b/doc/source/command-objects/volume.rst @@ -14,32 +14,45 @@ Create new volume os volume create --size <size> + [--type <volume-type>] + [--image <image>] [--snapshot <snapshot>] + [--source <volume>] [--description <description>] - [--type <volume-type>] [--user <user>] [--project <project>] [--availability-zone <availability-zone>] - [--image <image>] - [--source <volume>] [--property <key=value> [...] ] <name> .. option:: --size <size> (required) - New volume size in GB + Volume size in GB + +.. option:: --type <volume-type> + + Set the type of volume + + Select :option:`\<volume-type\>` from the available types as shown + by ``volume type list``. + +.. option:: --image <image> + + Use :option:`\<image\>` as source of volume (name or ID) + + This is commonly used to create a boot volume for a server. .. option:: --snapshot <snapshot> - Use <snapshot> as source of new volume + Use :option:`\<snapshot\>` as source of volume (name or ID) -.. option:: --description <description> +.. option:: --source <source> - New volume description + Volume to clone (name or ID) -.. option:: --type <volume-type> +.. option:: --description <description> - Use <volume-type> as the new volume type + Volume description .. option:: --user <user> @@ -51,23 +64,16 @@ Create new volume .. option:: --availability-zone <availability-zone> - Create new volume in <availability-zone> - -.. option:: --image <image> - - Use <image> as source of new volume (name or ID) - -.. option:: --source <source> - - Volume to clone (name or ID) + Create volume in :option:`\<availability-zone\>` .. option:: --property <key=value> Set a property on this volume (repeat option to set multiple properties) +.. _volume_create-name: .. describe:: <name> - New volume name + Volume name The :option:`--project` and :option:`--user` options are typically only useful for admin users, but may be allowed for other users depending on @@ -83,12 +89,13 @@ Delete volume(s) os volume delete [--force] - <volume> [<volume> ...] + <volume> [<volume> ...] .. option:: --force Attempt forced removal of volume(s), regardless of state (defaults to False) +.. _volume_delete-volume: .. describe:: <volume> Volume(s) to delete (name or ID) @@ -102,35 +109,37 @@ List volumes .. code:: bash os volume list - [--all-projects] [--project <project> [--project-domain <project-domain>]] [--user <user> [--user-domain <user-domain>]] [--name <name>] [--status <status>] + [--all-projects] [--long] .. option:: --project <project> - Filter results by project (name or ID) (admin only) + Filter results by :option:`\<project\>` (name or ID) (admin only) *Volume version 2 only* .. option:: --project-domain <project-domain> Domain the project belongs to (name or ID). + This can be used in case collisions between project names exist. *Volume version 2 only* .. option:: --user <user> - Filter results by user (name or ID) (admin only) + Filter results by :option:`\<user\>` (name or ID) (admin only) *Volume version 2 only* .. option:: --user-domain <user-domain> Domain the user belongs to (name or ID). + This can be used in case collisions between user names exist. *Volume version 2 only* @@ -161,8 +170,8 @@ Set volume properties os volume set [--name <name>] - [--description <description>] [--size <size>] + [--description <description>] [--property <key=value> [...] ] [--image-property <key=value> [...] ] <volume> @@ -171,25 +180,30 @@ Set volume properties New volume name -.. option:: --description <description> - - New volume description - .. option:: --size <size> Extend volume size in GB +.. option:: --description <description> + + New volume description + .. option:: --property <key=value> - Property to add or modify for this volume (repeat option to set multiple properties) + Set a property on this volume (repeat option to set multiple properties) .. option:: --image-property <key=value> - To add or modify image properties for this volume. + Set an image property on this volume (repeat option to set multiple image properties) + Image properties are copied along with the image when creating a volume + using :option:`--image`. Note that these properties are immutable on the + image itself, this option updates the copy attached to this volume. + *Volume version 2 only* +.. _volume_set-volume: .. describe:: <volume> Volume to modify (name or ID) @@ -205,6 +219,7 @@ Show volume details os volume show <volume> +.. _volume_show-volume: .. describe:: <volume> Volume to display (name or ID) @@ -224,13 +239,16 @@ Unset volume properties .. option:: --property <key> - Property to remove from volume (repeat option to remove multiple properties) + Remove a property from volume (repeat option to remove multiple properties) .. option:: --image-property <key> - To remove image properties from volume + Remove an image property from volume (repeat option to remove multiple image properties) + *Volume version 2 only* + +.. _volume_unset-volume: .. describe:: <volume> Volume to modify (name or ID) |