Merge "Fix for admin authentication from non-default domain in Keysto…

…ne v3" into R2.20
Juniper · Apr 19, 2016 · f48f2f2 · f48f2f2
2 parents b0358a5 + de80c1e
commit f48f2f2
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/config/api-server/vnc_auth_keystone.py b/src/config/api-server/vnc_auth_keystone.py
@@ -164,6 +164,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