return opts
class Client:
- def __init__(self, username=None, password=None, tenant=None, url=None, token=None, endpoint=None, deployment=None, *args, **kwds):
+ def __init__(self, username=None, password=None, tenant=None, url=None, token=None, endpoint=None, deployment=None, admin=True, *args, **kwds):
if not deployment or deployment not in deployment_auth:
else:
auth = deployment_auth[deployment]
-
self.has_openstack = has_openstack
- self.username = auth['user']
- self.password = auth['password']
- self.tenant = auth['tenant']
+
self.url = auth['url']
- self.endpoint = auth['endpoint']
- self.token = auth['token']
+ if admin:
+ self.username = auth['user']
+ self.password = auth['password']
+ self.tenant = auth['tenant']
+ self.endpoint = auth['endpoint']
+ self.token = auth['token']
+ else:
+ self.username = None
+ self.password = None
+ self.tenant = None
if username:
self.username = username
if endpoint:
self.endpoint = endpoint
- if '@' in self.username:
- self.username = self.username[:self.username.index('@')]
+ #if '@' in self.username:
+ # self.username = self.username[:self.username.index('@')]
class KeystoneDB:
@require_enabled