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/flavor.rst18
-rw-r--r--doc/source/command-objects/image.rst18
-rw-r--r--doc/source/command-objects/network.rst6
-rw-r--r--doc/source/command-objects/server.rst2
-rw-r--r--doc/source/command-objects/volume.rst5
5 files changed, 39 insertions, 10 deletions
diff --git a/doc/source/command-objects/flavor.rst b/doc/source/command-objects/flavor.rst
index 0083da0d..fa9fd805 100644
--- a/doc/source/command-objects/flavor.rst
+++ b/doc/source/command-objects/flavor.rst
@@ -89,6 +89,24 @@ List flavors
.. code:: bash
os flavor list
+ [--public | --private | --all]
+ [--long]
+
+.. option:: --public
+
+ List only public flavors (default)
+
+.. option:: --private
+
+ List only private flavors
+
+.. option:: --all
+
+ List all flavors, whether public or private
+
+.. option:: --long
+
+ List additional fields in output
flavor show
-----------
diff --git a/doc/source/command-objects/image.rst b/doc/source/command-objects/image.rst
index 63b55b89..bc38429d 100644
--- a/doc/source/command-objects/image.rst
+++ b/doc/source/command-objects/image.rst
@@ -138,14 +138,10 @@ List available images
.. code:: bash
os image list
- [--page-size <size>]
- [--public|--private]
+ [--public | --private | --shared]
+ [--property <key=value>]
[--long]
-.. option:: --page-size <size>
-
- Number of images to request in each paginated request
-
.. option:: --public
List only public images
@@ -154,6 +150,16 @@ List available images
List only private images
+.. option:: --shared
+
+ List only shared images
+
+ *Image version 2 only.*
+
+.. option:: --property <key=value>
+
+ Filter output based on property
+
.. option:: --long
List additional fields in output
diff --git a/doc/source/command-objects/network.rst b/doc/source/command-objects/network.rst
index cdf2ebfa..0edd2980 100644
--- a/doc/source/command-objects/network.rst
+++ b/doc/source/command-objects/network.rst
@@ -64,16 +64,16 @@ List networks
os network list
[--external]
- [--dhcp]
+ [--dhcp <dhcp-id>]
[--long]
.. option:: --external
List external networks
-.. option:: --dhcp
+.. option:: --dhcp <dhcp-id>
- ID of the DHCP agent
+ DHCP agent ID
.. option:: --long
diff --git a/doc/source/command-objects/server.rst b/doc/source/command-objects/server.rst
index 583acae0..ee6416fc 100644
--- a/doc/source/command-objects/server.rst
+++ b/doc/source/command-objects/server.rst
@@ -225,7 +225,7 @@ List servers
server lock
-----------
-Lock server
+Lock a server. A non-admin user will not be able to execute actions
.. program:: server lock
.. code:: bash
diff --git a/doc/source/command-objects/volume.rst b/doc/source/command-objects/volume.rst
index 2eec2d7b..0b2e0db6 100644
--- a/doc/source/command-objects/volume.rst
+++ b/doc/source/command-objects/volume.rst
@@ -134,6 +134,7 @@ Set volume properties
os volume set
[--name <name>]
[--description <description>]
+ [--size <size>]
[--property <key=value> [...] ]
<volume>
@@ -145,6 +146,10 @@ Set volume properties
New volume description
+.. option:: --size <size>
+
+ Extend volume size in GB
+
.. option:: --property <key=value>
Property to add or modify for this volume (repeat option to set multiple properties)