Merge "Make osprofiler dependency really "soft""

2016-09-05 03:44:26 +00:00
parent b9e87ef863 d655e010b8
commit 64bad97804
1 changed files with 3 additions and 2 deletions
--- a/mistralclient/api/httpclient.py
+++ b/mistralclient/api/httpclient.py
@@ -128,7 +128,8 @@ class HTTPClient(object):
        if target_auth_uri:
            headers['X-Target-Auth-Uri'] = target_auth_uri

-        # Add headers for osprofiler.
-        headers.update(osprofiler_web.get_trace_id_headers())
+        if osprofiler_web:
+            # Add headers for osprofiler.
+            headers.update(osprofiler_web.get_trace_id_headers())

        return headers