diff options
| author | Morgan Fainberg <morgan.fainberg@gmail.com> | 2014-06-10 15:32:10 -0700 |
|---|---|---|
| committer | Morgan Fainberg <morgan.fainberg@gmail.com> | 2014-07-02 13:30:28 -0700 |
| commit | 7354e68bde32d2829038a573705dcb3cddf95455 (patch) | |
| tree | 0e872a0fc18e041948994c04e153172d9499bd64 /etc | |
| parent | 0aaf6133b89a9d24f313bf0d3462bb4c5718a92f (diff) | |
| download | heat-7354e68bde32d2829038a573705dcb3cddf95455.tar.gz | |
Support using domain_name instead of domain_id
When using keystoneclient (heat.common.heat_keystoneclient) to
perform actions, support the use of domain_name instead of
exclusively domain_id.
The new config option to use domain_name instead of domain_id
is ``stack_user_domain_name``. If ``stack_user_domain_id`` option
is set (renamed from ``stack_user_domain``), the new
domain_name-specific option will be ignored.
Change-Id: I0d3937a98b95100ccaaaf7a46d3ed722aba27de3
Closes-Bug: #1313003
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/heat/heat.conf.sample | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/etc/heat/heat.conf.sample b/etc/heat/heat.conf.sample index 60de078ba..06ca08690 100644 --- a/etc/heat/heat.conf.sample +++ b/etc/heat/heat.conf.sample @@ -107,8 +107,15 @@ #heat_stack_user_role=heat_stack_user # Keystone domain ID which contains heat template-defined -# users. (string value) -#stack_user_domain=<None> +# users. If this option is set, stack_user_domain_name option +# will be ignored. (string value) +# Deprecated group/name - [DEFAULT]/stack_user_domain +#stack_user_domain_id=<None> + +# Keystone domain name which contains heat template-defined +# users. If `stack_user_domain_id` option is set, this option +# is ignored. (string value) +#stack_user_domain_name=<None> # Keystone username, a user with roles sufficient to manage # users and projects in the stack_user_domain. (string value) |