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/consistency-group.rst6
-rw-r--r--doc/source/command-objects/floating-ip.rst14
-rw-r--r--doc/source/command-objects/port.rst12
-rw-r--r--doc/source/command-objects/router.rst10
-rw-r--r--doc/source/command-objects/security-group.rst14
-rw-r--r--doc/source/command-objects/volume-host.rst30
-rw-r--r--doc/source/command-objects/volume-snapshot.rst16
7 files changed, 101 insertions, 1 deletions
diff --git a/doc/source/command-objects/consistency-group.rst b/doc/source/command-objects/consistency-group.rst
index cd972035..910fbba9 100644
--- a/doc/source/command-objects/consistency-group.rst
+++ b/doc/source/command-objects/consistency-group.rst
@@ -13,7 +13,7 @@ Create new consistency group.
.. code:: bash
os consistency group create
- --volume-type <volume-type> | --consistency-group-source <consistency-group>
+ --volume-type <volume-type> | --consistency-group-source <consistency-group> | --consistency-group-snapshot <consistency-group-snapshot>
[--description <description>]
[--availability-zone <availability-zone>]
[<name>]
@@ -26,6 +26,10 @@ Create new consistency group.
Existing consistency group (name or ID)
+.. option:: --consistency-group-snapshot <consistency-group-snapshot>
+
+ Existing consistency group snapshot (name or ID)
+
.. option:: --description <description>
Description of this consistency group
diff --git a/doc/source/command-objects/floating-ip.rst b/doc/source/command-objects/floating-ip.rst
index b2cc8af0..6a5e38b0 100644
--- a/doc/source/command-objects/floating-ip.rst
+++ b/doc/source/command-objects/floating-ip.rst
@@ -18,6 +18,7 @@ Create floating IP
[--floating-ip-address <floating-ip-address>]
[--fixed-ip-address <fixed-ip-address>]
[--description <description>]
+ [--project <project> [--project-domain <project-domain>]]
<network>
.. option:: --subnet <subnet>
@@ -45,6 +46,19 @@ Create floating IP
Set floating IP description
*Network version 2 only*
+.. option:: --project <project>
+
+ Owner's project (name or ID)
+
+ *Network 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.
+
+ *Network version 2 only*
+
.. describe:: <network>
Network to allocate floating IP from (name or ID)
diff --git a/doc/source/command-objects/port.rst b/doc/source/command-objects/port.rst
index 3aff2f77..73c53290 100644
--- a/doc/source/command-objects/port.rst
+++ b/doc/source/command-objects/port.rst
@@ -28,6 +28,7 @@ Create new port
[--enable | --disable]
[--mac-address <mac-address>]
[--security-group <security-group> | --no-security-group]
+ [--dns-name <dns-name>]
[--project <project> [--project-domain <project-domain>]]
[--enable-port-security | --disable-port-security]
<name>
@@ -91,6 +92,11 @@ Create new port
Associate no security groups with this port
+.. option:: --dns-name <dns-name>
+
+ Set DNS name to this port
+ (requires DNS integration extension)
+
.. option:: --project <project>
Owner's project (name or ID)
@@ -192,6 +198,7 @@ Set port properties
[--security-group <security-group>]
[--no-security-group]
[--enable-port-security | --disable-port-security]
+ [--dns-name <dns-name>]
<port>
.. option:: --description <description>
@@ -269,6 +276,11 @@ Set port properties
Disable port security for this port
+.. option:: --dns-name <dns-name>
+
+ Set DNS name to this port
+ (requires DNS integration extension)
+
.. _port_set-port:
.. describe:: <port>
diff --git a/doc/source/command-objects/router.rst b/doc/source/command-objects/router.rst
index 56b95ffa..059d1a3f 100644
--- a/doc/source/command-objects/router.rst
+++ b/doc/source/command-objects/router.rst
@@ -137,6 +137,7 @@ List routers
[--name <name>]
[--enable | --disable]
[--long]
+ [--project <project> [--project-domain <project-domain>]]
.. option:: --long
@@ -154,6 +155,15 @@ List routers
List disabled routers
+.. option:: --project <project>
+
+ List routers according to their project (name or ID)
+
+.. option:: --project-domain <project-domain>
+
+ Domain the project belongs to (name or ID).
+ This can be used in case collisions between project names exist.
+
router remove port
------------------
diff --git a/doc/source/command-objects/security-group.rst b/doc/source/command-objects/security-group.rst
index ba054554..5157f530 100644
--- a/doc/source/command-objects/security-group.rst
+++ b/doc/source/command-objects/security-group.rst
@@ -67,6 +67,7 @@ List security groups
os security group list
[--all-projects]
+ [--project <project> [--project-domain <project-domain>]]
.. option:: --all-projects
@@ -75,6 +76,19 @@ List security groups
*Network version 2 ignores this option and will always display information*
*for all projects (admin only).*
+.. option:: --project <project>
+
+ List security groups according to the project (name or ID)
+
+ *Network 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.
+
+ *Network version 2 only*
+
security group set
------------------
diff --git a/doc/source/command-objects/volume-host.rst b/doc/source/command-objects/volume-host.rst
new file mode 100644
index 00000000..956fce52
--- /dev/null
+++ b/doc/source/command-objects/volume-host.rst
@@ -0,0 +1,30 @@
+===========
+volume host
+===========
+
+Volume v2
+
+volume host set
+---------------
+
+Set volume host properties
+
+.. program:: volume host set
+.. code:: bash
+
+ os volume host set
+ [--enable | --disable]
+ <host-name>
+
+.. option:: --enable
+
+ Thaw and enable the specified volume host
+
+.. option:: --disable
+
+ Freeze and disable the specified volume host
+
+.. _volume-host-set:
+.. describe:: <host-name>
+
+ Name of volume host
diff --git a/doc/source/command-objects/volume-snapshot.rst b/doc/source/command-objects/volume-snapshot.rst
index b84601f4..2d9406b6 100644
--- a/doc/source/command-objects/volume-snapshot.rst
+++ b/doc/source/command-objects/volume-snapshot.rst
@@ -71,6 +71,9 @@ List volume snapshots
[--long]
[--limit <limit>]
[--marker <marker>]
+ [--name <name>]
+ [--status <status>]
+ [--volume <volume>]
.. option:: --all-projects
@@ -80,6 +83,19 @@ List volume snapshots
List additional fields in output
+.. option:: --status <status>
+
+ Filters results by a status.
+ ('available', 'error', 'creating', 'deleting' or 'error-deleting')
+
+.. option:: --name <name>
+
+ Filters results by a name.
+
+.. option:: --volume <volume>
+
+ Filters results by a volume (name or ID).
+
.. option:: --limit <limit>
Maximum number of snapshots to display