summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorhuangtianhua <huangtianhua@huawei.com>2014-10-15 11:41:45 +0800
committerhuangtianhua <huangtianhua@huawei.com>2014-10-20 02:49:59 +0000
commitaab01c00ff330d743fc15e97d7ae144eac5015bb (patch)
treeb978b30918c74ae590e01c288af8cce5ddcdc0a3 /etc
parent6b9a2b54c7360721fc5137caf65c6b2901d9bb72 (diff)
downloadheat-aab01c00ff330d743fc15e97d7ae144eac5015bb.tar.gz
Inherit roles for create_trust_context()
This change the default value of the option 'trusts_delegated_roles' to []. And delegate all of the trustor roles when create the trust unless user set the option to subset roles. Change-Id: I3f1b70b78b91bfac9af5fadb71140679b208c999 Closes-bug: #1376562
Diffstat (limited to 'etc')
-rw-r--r--etc/heat/heat.conf.sample7
1 files changed, 4 insertions, 3 deletions
diff --git a/etc/heat/heat.conf.sample b/etc/heat/heat.conf.sample
index cec3f01c4..c14c6051d 100644
--- a/etc/heat/heat.conf.sample
+++ b/etc/heat/heat.conf.sample
@@ -35,9 +35,10 @@
# (string value)
#deferred_auth_method=password
-# Subset of trustor roles to be delegated to heat. (list
-# value)
-#trusts_delegated_roles=heat_stack_owner
+# Subset of trustor roles to be delegated to heat. If left
+# unset, all roles of a user will be delegated to heat when
+# creating a stack. (list value)
+#trusts_delegated_roles=
# Maximum resources allowed per top-level stack. (integer
# value)