From de80c1ea804283a1882946e280009fa3ac1e61b9 Mon Sep 17 00:00:00 2001
From: Jakub Pavlik <pavlk.jakub@gmail.com>
Date: Tue, 1 Mar 2016 09:32:43 +0100
Subject: [PATCH] Fix for admin authentication from non-default domain in
 Keystone v3

Closes-Bug: #1551606
Change-Id: I831e206b06a7ae96fe43edd15e2b8fc63f93283e
(cherry picked from commit cc4066cdc2910251ca7581b5ea7016566fc52fb2)
---
 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 d2c7a805e1f..9a03f4e3687 100644
--- a/src/config/api-server/vnc_auth_keystone.py
+++ b/src/config/api-server/vnc_auth_keystone.py
@@ -156,6 +156,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