summaryrefslogtreecommitdiff
path: root/doc/source/command-objects
diff options
context:
space:
mode:
Diffstat (limited to 'doc/source/command-objects')
-rw-r--r--doc/source/command-objects/aggregate.rst6
-rw-r--r--doc/source/command-objects/flavor.rst18
-rw-r--r--doc/source/command-objects/service.rst2
-rw-r--r--doc/source/command-objects/subnet.rst9
-rw-r--r--doc/source/command-objects/user.rst2
5 files changed, 29 insertions, 8 deletions
diff --git a/doc/source/command-objects/aggregate.rst b/doc/source/command-objects/aggregate.rst
index 7616c496..25c7041a 100644
--- a/doc/source/command-objects/aggregate.rst
+++ b/doc/source/command-objects/aggregate.rst
@@ -56,17 +56,17 @@ Create a new aggregate
aggregate delete
----------------
-Delete an existing aggregate
+Delete existing aggregate(s)
.. program:: aggregate delete
.. code:: bash
os aggregate delete
- <aggregate>
+ <aggregate> [<aggregate> ...]
.. describe:: <aggregate>
- Aggregate to delete (name or ID)
+ Aggregate(s) to delete (name or ID)
aggregate list
--------------
diff --git a/doc/source/command-objects/flavor.rst b/doc/source/command-objects/flavor.rst
index a30bedec..a886b9ff 100644
--- a/doc/source/command-objects/flavor.rst
+++ b/doc/source/command-objects/flavor.rst
@@ -21,6 +21,8 @@ Create new flavor
[--vcpus <num-cpu>]
[--rxtx-factor <factor>]
[--public | --private]
+ [--project <project>]
+ [--project-domain <project-domain>]
<flavor-name>
.. option:: --id <id>
@@ -59,6 +61,16 @@ Create new flavor
Flavor is not available to other projects
+.. option:: --project <project>
+
+ Allow <project> to access private flavor (name or ID)
+ (Must be used with :option:`--private` option)
+
+.. option:: --project-domain <project-domain>
+
+ Domain the project belongs to (name or ID).
+ This can be used in case collisions between project names exist.
+
.. _flavor_create-flavor-name:
.. describe:: <flavor-name>
@@ -67,18 +79,18 @@ Create new flavor
flavor delete
-------------
-Delete flavor
+Delete flavor(s)
.. program:: flavor delete
.. code:: bash
os flavor delete
- <flavor>
+ <flavor> [<flavor> ...]
.. _flavor_delete-flavor:
.. describe:: <flavor>
- Flavor to delete (name or ID)
+ Flavor(s) to delete (name or ID)
flavor list
-----------
diff --git a/doc/source/command-objects/service.rst b/doc/source/command-objects/service.rst
index 352f68a0..421a298b 100644
--- a/doc/source/command-objects/service.rst
+++ b/doc/source/command-objects/service.rst
@@ -117,7 +117,7 @@ Set service properties
.. _service_set-service:
.. describe:: <service>
- Service to update (type, name or ID)
+ Service to modify (type, name or ID)
service show
------------
diff --git a/doc/source/command-objects/subnet.rst b/doc/source/command-objects/subnet.rst
index c52d73f9..fe77ccfd 100644
--- a/doc/source/command-objects/subnet.rst
+++ b/doc/source/command-objects/subnet.rst
@@ -28,6 +28,7 @@ Create new subnet
[--ip-version {4,6}]
[--ipv6-ra-mode {dhcpv6-stateful,dhcpv6-stateless,slaac}]
[--ipv6-address-mode {dhcpv6-stateful,dhcpv6-stateless,slaac}]
+ [--network-segment <network-segment>]
--network <network>
<name>
@@ -107,6 +108,14 @@ Create new subnet
IPv6 address mode, valid modes: [dhcpv6-stateful, dhcpv6-stateless, slaac]
+.. option:: --network-segment <network-segment>
+
+ Network segment to associate with this subnet (ID only)
+
+ .. caution:: This is a beta command option and subject
+ to change. Use global option ``--os-beta-command``
+ to enable this command option.
+
.. option:: --network <network>
Network this subnet belongs to (name or ID)
diff --git a/doc/source/command-objects/user.rst b/doc/source/command-objects/user.rst
index b3707a2a..a9fee728 100644
--- a/doc/source/command-objects/user.rst
+++ b/doc/source/command-objects/user.rst
@@ -95,7 +95,7 @@ Delete user(s)
.. _user_delete-user:
.. describe:: <user>
- User to delete (name or ID)
+ User(s) to delete (name or ID)
user list
---------