From b053c4586e9850ca45436b9352a222ebe0c26f62 Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Mon, 6 Nov 2017 16:40:13 +1100
Subject: [PATCH] noauth: only set token_info if set

Only add the token_info to the keystone headers if it is set.
This resolves an issue which breaks the catalog for some previous
deployments using noauth middleware (the old TripleO undercloud
deploy architecture).

Change-Id: I74d0f71149014418db3af226b419eb7a9cb5bb1e
Closes-bug: #1730280
---
 heat/common/noauth.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/heat/common/noauth.py b/heat/common/noauth.py
index 88351e19b9..99c6de4707 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