summaryrefslogtreecommitdiff
path: root/config-generator.conf
diff options
context:
space:
mode:
authorSteven Hardy <shardy@redhat.com>2015-12-07 11:20:25 +0000
committerSteven Hardy <shardy@redhat.com>2015-12-07 17:42:17 +0000
commit67f12e5e24eb9ec06e609f4399008b9d704128a1 (patch)
treee5c045cd992a10a96205d69bbac8d8592d046da8 /config-generator.conf
parentfcb23785b34b0aaae20b271153e29f1d8f51c186 (diff)
downloadheat-67f12e5e24eb9ec06e609f4399008b9d704128a1.tar.gz
Add trustee config group to sample config
Some time ago, we added support for a new "trustee" config section, aimed at allowing independent configuration of the credentials used to obtain trust-scoped tokens for deferred authentication. One of the main reasons for this was to avoid incorrectly using the keystone auth_token section, and as such a deprecation warning was added when we fall back to using that config section for heat. Unfortunately we didn't capture this new section in the sample config because it's registered via keystoneclient.auth, so this adds support for this section to the sample config generated via tox -e genconfig, and adds some notes clarifying usage to the auth_plugin option. To move to the new config syntax, but maintain the current behavior, which is to delegate to the heat service user, you can add this section to your heat.conf [trustee] auth_plugin = password auth_url = http://<keystone hostname or IP>:35357 username = heat password = password user_domain_id = default The generated config documents many more options, all of those supported by the keystoneclient v3 Password auth plugin, but these are the minimum to enable delegation to the heat service user in the default domain. In new deployments this could be set to some other user (such as one created in the heat domain), but note that the trustee should not be changed for existing deployments where stacks exist, as the trust stored inside heat defines a relationship between the stack owner (trustor) and a specific trustee (which will be the heat service user if the deployment is using the deprecated path that steals credentials from keystone auth_token). Change-Id: I30aeb765a2246ce54b10972ae7187655d85cde1f Partial-Bug: #1300246
Diffstat (limited to 'config-generator.conf')
-rw-r--r--config-generator.conf1
1 files changed, 1 insertions, 0 deletions
diff --git a/config-generator.conf b/config-generator.conf
index 469ec00fe..44e94d110 100644
--- a/config-generator.conf
+++ b/config-generator.conf
@@ -2,6 +2,7 @@
output_file = etc/heat/heat.conf.sample
wrap_width = 79
namespace = heat.common.config
+namespace = heat.common.context
namespace = heat.common.crypt
namespace = heat.common.heat_keystoneclient
namespace = heat.common.wsgi