git://git.onelab.eu
/
plstackapi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
278f995
)
admin 'admin' argument to constructor
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Mon, 7 Apr 2014 23:49:01 +0000
(19:49 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Mon, 7 Apr 2014 23:49:14 +0000
(19:49 -0400)
planetstack/openstack/client.py
patch
|
blob
|
history
diff --git
a/planetstack/openstack/client.py
b/planetstack/openstack/client.py
index
16f6b2e
..
c543947
100644
(file)
--- a/
planetstack/openstack/client.py
+++ b/
planetstack/openstack/client.py
@@
-40,7
+40,7
@@
def parse_novarc(filename):
return opts
class Client:
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:
if not deployment or deployment not in deployment_auth:
@@
-48,14
+48,19
@@
class Client:
else:
auth = deployment_auth[deployment]
else:
auth = deployment_auth[deployment]
-
self.has_openstack = has_openstack
self.has_openstack = has_openstack
- self.username = auth['user']
- self.password = auth['password']
- self.tenant = auth['tenant']
+
self.url = auth['url']
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 username:
self.username = username