From 620f0f3899ad9215925856498890fc552c58f744 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Fri, 3 May 2013 14:18:31 -0400 Subject: [PATCH] fix ability to work without openstack libs --- plstackapi/openstack/manager.py | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) 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): -- 2.43.0