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/availability-zone.rst (renamed from doc/source/command-objects/availability_zone.rst)0
-rw-r--r--doc/source/command-objects/role-assignment.rst (renamed from doc/source/command-objects/role_assignment.rst)0
-rw-r--r--doc/source/command-objects/role.rst21
-rw-r--r--doc/source/command-objects/volume-qos.rst (renamed from doc/source/command-objects/volume_qos.rst)0
-rw-r--r--doc/source/command-objects/volume-type.rst18
-rw-r--r--doc/source/command-objects/volume.rst2
6 files changed, 36 insertions, 5 deletions
diff --git a/doc/source/command-objects/availability_zone.rst b/doc/source/command-objects/availability-zone.rst
index 37435230..37435230 100644
--- a/doc/source/command-objects/availability_zone.rst
+++ b/doc/source/command-objects/availability-zone.rst
diff --git a/doc/source/command-objects/role_assignment.rst b/doc/source/command-objects/role-assignment.rst
index 6bb24cb3..6bb24cb3 100644
--- a/doc/source/command-objects/role_assignment.rst
+++ b/doc/source/command-objects/role-assignment.rst
diff --git a/doc/source/command-objects/role.rst b/doc/source/command-objects/role.rst
index d26932b1..9ba149ec 100644
--- a/doc/source/command-objects/role.rst
+++ b/doc/source/command-objects/role.rst
@@ -15,6 +15,7 @@ Add role to a user or group in a project or domain
os role add
--domain <domain> | --project <project> [--project-domain <project-domain>]
--user <user> [--user-domain <user-domain>] | --group <group> [--group-domain <group-domain>]
+ --inherited
<role>
.. option:: --domain <domain>
@@ -58,6 +59,12 @@ Add role to a user or group in a project or domain
.. versionadded:: 3
+.. option:: --inherited
+
+ Specifies if the role grant is inheritable to the sub projects.
+
+ .. versionadded:: 3
+
.. describe:: <role>
Role to add to `<project>`:`<user>` (name or ID)
@@ -110,6 +117,7 @@ List roles
os role list
--domain <domain> | --project <project> [--project-domain <project-domain>]
--user <user> [--user-domain <user-domain>] | --group <group> [--group-domain <group-domain>]
+ --inherited
.. option:: --domain <domain>
@@ -156,6 +164,12 @@ List roles
.. versionadded:: 3
+.. option:: --inherited
+
+ Specifies if the role grant is inheritable to the sub projects.
+
+ .. versionadded:: 3
+
role remove
-----------
@@ -167,6 +181,7 @@ Remove role from domain/project : user/group
os role remove
--domain <domain> | --project <project> [--project-domain <project-domain>]
--user <user> [--user-domain <user-domain>] | --group <group> [--group-domain <group-domain>]
+ --inherited
<role>
.. option:: --domain <domain>
@@ -210,6 +225,12 @@ Remove role from domain/project : user/group
.. versionadded:: 3
+.. option:: --inherited
+
+ Specifies if the role grant is inheritable to the sub projects.
+
+ .. versionadded:: 3
+
.. describe:: <role>
Role to remove (name or ID)
diff --git a/doc/source/command-objects/volume_qos.rst b/doc/source/command-objects/volume-qos.rst
index d0fe36f9..d0fe36f9 100644
--- a/doc/source/command-objects/volume_qos.rst
+++ b/doc/source/command-objects/volume-qos.rst
diff --git a/doc/source/command-objects/volume-type.rst b/doc/source/command-objects/volume-type.rst
index 4d5651ac..0edd742a 100644
--- a/doc/source/command-objects/volume-type.rst
+++ b/doc/source/command-objects/volume-type.rst
@@ -77,17 +77,29 @@ List volume types
volume type set
---------------
-*Only supported for Volume API v1*
-
Set volume type properties
.. program:: volume type set
.. code:: bash
os volume type set
+ [--name <name>]
+ [--description <description>]
[--property <key=value> [...] ]
<volume-type>
+.. option:: --name <name>
+
+ Set volume type name
+
+ .. versionadded:: 2
+
+.. option:: --description <description>
+
+ Set volume type description
+
+ .. versionadded:: 2
+
.. option:: --property <key=value>
Property to add or modify for this volume type (repeat option to set multiple properties)
@@ -99,8 +111,6 @@ Set volume type properties
volume type unset
-----------------
-*Only supported for Volume API v1*
-
Unset volume type properties
.. program:: volume type unset
diff --git a/doc/source/command-objects/volume.rst b/doc/source/command-objects/volume.rst
index 3baae5d8..556d1645 100644
--- a/doc/source/command-objects/volume.rst
+++ b/doc/source/command-objects/volume.rst
@@ -2,7 +2,7 @@
volume
======
-Volume v1
+Volume v1, v2
volume create
-------------