fix ability to work without openstack libs

[plstackapi.git] / plstackapi / openstack / manager.py

diff --git a/plstackapi/openstack/manager.py b/plstackapi/openstack/manager.py
index e48acc0..96947c9 100644 (file)
--- a/plstackapi/openstack/manager.py
+++ b/plstackapi/openstack/manager.py
@@ -24,14 +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
+        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):
@@ -76,7 +86,7 @@ class OpenStackManager:
 
     
     @require_enabled
-    def save_site(self, site):
+    def save_site(self, site, add_role=True):
         if not site.tenant_id:
             tenant = self.driver.create_tenant(tenant_name=site.login_base,
                                                description=site.name,