From d3206c790da923f809f2aadd3f5c347c90bef6d6 Mon Sep 17 00:00:00 2001
From: Jakub Pavlik <pavlk.jakub@gmail.com>
Date: Tue, 19 Apr 2016 18:03:28 +0200
Subject: [PATCH] Fix for admin authentication from non-default domain in
 Keystone v3. Tested and verified against latest Contrail 3.0 build.

Closes-Bug: #1551606
Change-Id: I831e206b06a7ae96fe43edd15e2b8fc63f93283e
---
 src/config/api-server/vnc_auth_keystone.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/config/api-server/vnc_auth_keystone.py b/src/config/api-server/vnc_auth_keystone.py
index 33dbd0f9ab2..a3ff51ca7ed 100644
--- a/src/config/api-server/vnc_auth_keystone.py
+++ b/src/config/api-server/vnc_auth_keystone.py
@@ -148,6 +148,11 @@ def __init__(self, server_mgr, args):
             'max_requests': args.max_requests,
             'insecure':args.insecure,
         }
+        try:
+            if 'v3' in args.auth_url:
+                self._conf_info['auth_version'] = 'v3.0'
+        except AttributeError:
+            pass
         if _kscertbundle:
            self._conf_info['cafile'] = _kscertbundle
         self._server_mgr = server_mgr