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/image.rst6
-rw-r--r--doc/source/command-objects/port.rst29
-rw-r--r--doc/source/command-objects/request-token.rst3
-rw-r--r--doc/source/command-objects/volume-snapshot.rst15
4 files changed, 50 insertions, 3 deletions
diff --git a/doc/source/command-objects/image.rst b/doc/source/command-objects/image.rst
index 999842af..7a9ead5c 100644
--- a/doc/source/command-objects/image.rst
+++ b/doc/source/command-objects/image.rst
@@ -76,7 +76,8 @@ Create/upload an image
.. option:: --container-format <container-format>
- Image container format (default: bare)
+ Image container format. The supported options are: ami, ari, aki,
+ bare, docker, ova, ovf. The default format is: bare
.. option:: --disk-format <disk-format>
@@ -342,7 +343,8 @@ Set image properties
.. option:: --container-format <container-format>
- Image container format (default: bare)
+ Image container format. The supported options are: ami, ari, aki,
+ bare, docker, ova, ovf.
.. option:: --disk-format <disk-format>
diff --git a/doc/source/command-objects/port.rst b/doc/source/command-objects/port.rst
index 34656f32..e67ca0f7 100644
--- a/doc/source/command-objects/port.rst
+++ b/doc/source/command-objects/port.rst
@@ -29,6 +29,7 @@ Create new port
[--mac-address <mac-address>]
[--security-group <security-group> | --no-security-group]
[--dns-name <dns-name>]
+ [--allowed-address ip-address=<ip-address>[,mac-address=<mac-address>]]
[--project <project> [--project-domain <project-domain>]]
[--enable-port-security | --disable-port-security]
<name>
@@ -97,6 +98,12 @@ Create new port
Set DNS name to this port
(requires DNS integration extension)
+.. option:: --allowed-address ip-address=<ip-address>[,mac-address=<mac-address>]
+
+ Add allowed-address pair associated with this port:
+ ip-address=<ip-address>[,mac-address=<mac-address>]
+ (repeat option to set multiple allowed-address pairs)
+
.. option:: --project <project>
Owner's project (name or ID)
@@ -199,6 +206,8 @@ Set port properties
[--no-security-group]
[--enable-port-security | --disable-port-security]
[--dns-name <dns-name>]
+ [--allowed-address ip-address=<ip-address>[,mac-address=<mac-address>]]
+ [--no-allowed-address]
<port>
.. option:: --description <description>
@@ -281,6 +290,19 @@ Set port properties
Set DNS name to this port
(requires DNS integration extension)
+.. option:: --allowed-address ip-address=<ip-address>[,mac-address=<mac-address>]
+
+ Add allowed-address pair associated with this port:
+ ip-address=<ip-address>[,mac-address=<mac-address>]
+ (repeat option to set multiple allowed-address pairs)
+
+.. option:: --no-allowed-address
+
+ Clear existing allowed-address pairs associated
+ with this port.
+ (Specify both --allowed-address and --no-allowed-address
+ to overwrite the current allowed-address pairs)
+
.. _port_set-port:
.. describe:: <port>
@@ -314,6 +336,7 @@ Unset port properties
[--fixed-ip subnet=<subnet>,ip-address=<ip-address> [...]]
[--binding-profile <binding-profile-key> [...]]
[--security-group <security-group> [...]]
+ [--allowed-address ip-address=<ip-address>[,mac-address=<mac-address>] [...]]
<port>
.. option:: --fixed-ip subnet=<subnet>,ip-address=<ip-address>
@@ -332,6 +355,12 @@ Unset port properties
Security group which should be removed from this port (name or ID)
(repeat option to unset multiple security groups)
+.. option:: --allowed-address ip-address=<ip-address>[,mac-address=<mac-address>]
+
+ Desired allowed-address pair which should be removed from this port:
+ ip-address=<ip-address>[,mac-address=<mac-address>]
+ (repeat option to unset multiple allowed-address pairs)
+
.. _port_unset-port:
.. describe:: <port>
diff --git a/doc/source/command-objects/request-token.rst b/doc/source/command-objects/request-token.rst
index ec72dd14..3c80780f 100644
--- a/doc/source/command-objects/request-token.rst
+++ b/doc/source/command-objects/request-token.rst
@@ -24,7 +24,8 @@ Authorize a request token
.. option:: --role <role>
- Roles to authorize (name or ID) (repeat to set multiple values) (required)
+ Roles to authorize (name or ID)
+ (repeat option to set multiple values) (required)
request token create
--------------------
diff --git a/doc/source/command-objects/volume-snapshot.rst b/doc/source/command-objects/volume-snapshot.rst
index 37a5088a..3cf46ad5 100644
--- a/doc/source/command-objects/volume-snapshot.rst
+++ b/doc/source/command-objects/volume-snapshot.rst
@@ -82,6 +82,7 @@ List volume snapshots
openstack volume snapshot list
[--all-projects]
+ [--project <project> [--project-domain <project-domain>]]
[--long]
[--limit <limit>]
[--marker <marker>]
@@ -93,6 +94,20 @@ List volume snapshots
Include all projects (admin only)
+.. option:: --project <project>
+
+ Filter results by 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:: --long
List additional fields in output