summaryrefslogtreecommitdiff
path: root/heat/common
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2017-11-10 11:47:27 +0000
committerGerrit Code Review <review@openstack.org>2017-11-10 11:47:27 +0000
commitf690a94f26422442e68b6e1496b9a83bba122c92 (patch)
tree54bf87f83a464baaf65650b0aef607d82c9fe07a /heat/common
parent4c1f7f9e2932c014e88fe3830bb99233836fa102 (diff)
parentb053c4586e9850ca45436b9352a222ebe0c26f62 (diff)
downloadheat-f690a94f26422442e68b6e1496b9a83bba122c92.tar.gz
Merge "noauth: only set token_info if set"
Diffstat (limited to 'heat/common')
-rw-r--r--heat/common/noauth.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/heat/common/noauth.py b/heat/common/noauth.py
index 88351e19b..99c6de470 100644
--- a/heat/common/noauth.py
+++ b/heat/common/noauth.py
@@ -66,8 +66,9 @@ class NoAuthProtocol(object):
'HTTP_X_AUTH_USER': username,
'HTTP_X_AUTH_KEY': 'unset',
'HTTP_X_AUTH_URL': 'url',
- 'keystone.token_info': self._token_info,
}
+ if self._token_info:
+ headers['keystone.token_info'] = self._token_info
return headers