From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Fri, 3 May 2013 18:18:31 +0000 (-0400)
Subject: fix ability to work without openstack libs
X-Git-Tag: 1.0~61^2~38
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=620f0f3899ad9215925856498890fc552c58f744;p=plstackapi.git

fix ability to work without openstack libs
---

diff --git a/plstackapi/openstack/manager.py b/plstackapi/openstack/manager.py
index c55e752..96947c9 100644
--- a/plstackapi/openstack/manager.py
+++ b/plstackapi/openstack/manager.py
@@ -24,17 +24,24 @@ def require_enabled(callable):
 class OpenStackManager:
 
     def __init__(self, auth={}, caller=None):
-        if auth:
-            self.client = OpenStackClient(**auth)
-        else:
-            self.client = OpenStackClient()   
+        self.client = None
+        self.driver = None
+        self.caller = None
         self.has_openstack = has_openstack       
-        self.enabled = manager_enabled 
-        self.driver = OpenStackDriver(client=self.client) 
-        self.caller=caller
-        if not self.caller:
-            self.caller = self.driver.admin_user
-            self.caller.user_id = self.caller.id 
+        self.enabled = manager_enabled
+
+        if has_openstack and manager_enabled:
+            if auth:
+                self.client = OpenStackClient(**auth)
+            else:
+                self.client = OpenStackClient()
+            self.driver = OpenStackDriver(client=self.client) 
+            
+            if caller:
+                self.caller = caller:
+            else:
+                self.caller = self.driver.admin_user
+                self.caller.user_id = self.caller.id 
 
     @require_enabled
     def save_role(self, role):