Merge "Add resource option immutable"

2 files changed, 40 insertions, 0 deletions

diff --git a/doc/source/cli/command-objects/project.rst b/doc/source/cli/command-objects/project.rst
index ac7e8cd1..afa785cb 100644
--- a/doc/source/cli/command-objects/project.rst
+++ b/doc/source/cli/command-objects/project.rst
@@ -16,6 +16,7 @@ Create new project
         [--domain <domain>]
         [--parent <project>]
         [--description <description>]
+        [--immutable | --no-immutable]
         [--enable | --disable]
         [--property <key=value>]
         [--or-show]
@@ -46,6 +47,15 @@ Create new project
 
     Disable project
 
+.. option:: --immutable
+
+    Make project immutable. An immutable project may not be deleted or
+    modified except to remove the immutable flag
+
+.. option:: --no-immutable
+
+    Make project mutable (default)
+
 .. option:: --property <key=value>
 
     Add a property to :ref:`\<name\> <project_create-name>`
@@ -180,6 +190,7 @@ Set project properties
         [--name <name>]
         [--domain <domain>]
         [--description <description>]
+        [--immutable | --no-immutable]
         [--enable | --disable]
         [--property <key=value>]
         [--tag <tag> | --clear-tags | --remove-tags <tag>]
@@ -199,6 +210,15 @@ Set project properties
 
     Set project description
 
+.. option:: --immutable
+
+    Make project immutable. An immutable project may not be deleted or
+    modified except to remove the immutable flag
+
+.. option:: --no-immutable
+
+    Make project mutable (default)
+
 .. option:: --enable
 
     Enable project (default)
diff --git a/doc/source/cli/command-objects/role.rst b/doc/source/cli/command-objects/role.rst
index 752dc4e0..f9fd28eb 100644
--- a/doc/source/cli/command-objects/role.rst
+++ b/doc/source/cli/command-objects/role.rst
@@ -97,6 +97,7 @@ Create new role
     openstack role create
         [--or-show]
         [--domain <domain>]
+        [--immutable | --no-immutable]
         <name>
 
 .. option:: --domain <domain>
@@ -119,6 +120,15 @@ Create new role
 
     Add description about the role
 
+.. option:: --immutable
+
+    Make role immutable. An immutable role may not be deleted or modified
+    except to remove the immutable flag
+
+.. option:: --no-immutable
+
+    Make role mutable (default)
+
 role delete
 -----------
 
@@ -253,6 +263,7 @@ Set role properties
     openstack role set
         [--name <name>]
         [--domain <domain>]
+        [--immutable | --no-immutable]
         <role>
 
 .. option:: --name <name>
@@ -269,6 +280,15 @@ Set role properties
 
     Role to modify (name or ID)
 
+.. option:: --immutable
+
+    Make role immutable. An immutable role may not be deleted or modified
+    except to remove the immutable flag
+
+.. option:: --no-immutable
+
+    Make role mutable (default)
+
 role show
 ---------