From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Tue, 24 Sep 2013 14:30:39 +0000 (-0400)
Subject: bugfixes
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c12d5ca159b7808a3f35beae4ec76b0eb090d7c0;p=plstackapi.git

bugfixes
---

diff --git a/planetstack/observer/event_loop.py b/planetstack/observer/event_loop.py
index 9884390..5ce4b54 100644
--- a/planetstack/observer/event_loop.py
+++ b/planetstack/observer/event_loop.py
@@ -85,8 +85,8 @@ class PlanetStackObserver:
         except Exception,e:
             raise e
 
-        backend_path = Config().observer_backend_dependency_graph
         try:
+            backend_path = Config().observer_pl_dependency_graph
             # This contains dependencies between backend records
             self.backend_dependency_graph = json.loads(open(backend_path).read())
         except Exception,e:
@@ -178,7 +178,7 @@ class PlanetStackObserver:
         except:
             self.last_run_times={}
             for e in self.ordered_steps:
-                self.last_run_times[e.name]=0
+                self.last_run_times[e]=0
 
 
 
diff --git a/planetstack/openstack/driver.py b/planetstack/openstack/driver.py
index b6995b8..234dcbf 100644
--- a/planetstack/openstack/driver.py
+++ b/planetstack/openstack/driver.py
@@ -26,6 +26,9 @@ class OpenStackDriver:
         else:
             self.shell = OpenStackClient()
 
+        self.enabled = manager_enabled
+        self.has_openstack = has_openstack
+
     def client_driver(self, caller=None, tenant=None):
         if caller:
             auth = {'username': caller.email,