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:
a525708
)
Fixed library compatibility problems and auth errors
author
Sapan Bhatia
<sapanb@cs.princeton.edu>
Wed, 22 Oct 2014 03:58:06 +0000
(23:58 -0400)
committer
Sapan Bhatia
<sapanb@cs.princeton.edu>
Wed, 22 Oct 2014 03:58:06 +0000
(23:58 -0400)
planetstack/openstack/driver.py
patch
|
blob
|
history
diff --git
a/planetstack/openstack/driver.py
b/planetstack/openstack/driver.py
index
093ab5a
..
6fb81a5
100644
(file)
--- a/
planetstack/openstack/driver.py
+++ b/
planetstack/openstack/driver.py
@@
-28,18
+28,18
@@
class OpenStackDriver:
self.admin_user = None
def client_driver(self, caller=None, tenant=None, deployment=None):
self.admin_user = None
def client_driver(self, caller=None, tenant=None, deployment=None):
- admin_driver = self.admin_driver(tenant=tenant, deployment=deployment)
if caller:
auth = {'username': caller.email,
'password': hashlib.md5(caller.password).hexdigest()[:6],
'tenant': tenant}
if caller:
auth = {'username': caller.email,
'password': hashlib.md5(caller.password).hexdigest()[:6],
'tenant': tenant}
- client = OpenStackClient(deployment=
admin_driver.
deployment, **auth)
+ client = OpenStackClient(deployment=deployment, **auth)
else:
else:
+ admin_driver = self.admin_driver(tenant=tenant, deployment=deployment)
client = OpenStackClient(tenant=tenant, deployment=admin_driver.deployment)
driver = OpenStackDriver(client=client)
client = OpenStackClient(tenant=tenant, deployment=admin_driver.deployment)
driver = OpenStackDriver(client=client)
- driver.admin_user = admin_driver.admin_user
- driver.deployment = admin_driver.deployment
+
#
driver.admin_user = admin_driver.admin_user
+
#
driver.deployment = admin_driver.deployment
return driver
def admin_driver(self, tenant=None, deployment=None):
return driver
def admin_driver(self, tenant=None, deployment=None):