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

…ne v3. Tested and verified against latest Contrail 3.0 build." into R3.0
Juniper · Apr 25, 2016 · 8970ee5 · 8970ee5
2 parents b1e91c8 + d3206c7
commit 8970ee5
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
@@ -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