commit c12d5ca159b7808a3f35beae4ec76b0eb090d7c0
author Tony Mack <tmack@paris.CS.Princeton.EDU> Tue Sep 24 10:30:39 2013 -0400
committer Tony Mack <tmack@paris.CS.Princeton.EDU> Tue Sep 24 10:30:39 2013 -0400
tree eb6b38cae55f4d558c1f39a1f6bd099994b03540
parent ce79de09a6a65b2be1de89c0ad9e74cf544f2db2

bugfixes

planetstack/observer/event_loop.py

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 @@
         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 @@
         except:
             self.last_run_times={}
             for e in self.ordered_steps:
-                self.last_run_times[e.name]=0
+                self.last_run_times[e]=0
 
 
 

planetstack/openstack/driver.py

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 @@
         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,