removing plural from model names. some cleanup

[plstackapi.git] / planetstack / openstack_observer / event_loop.py

diff --git a/planetstack/openstack_observer/event_loop.py b/planetstack/openstack_observer/event_loop.py
index 12965bb..cdd94a2 100644 (file)
--- a/planetstack/openstack_observer/event_loop.py
+++ b/planetstack/openstack_observer/event_loop.py
@@ -50,7 +50,7 @@ def invert_graph(g):
        return ig
 
 class PlanetStackObserver:
-       #sync_steps = [SyncNetworks,SyncNetworkSlivers,SyncSites,SyncSitePrivileges,SyncSlices,SyncSliceMemberships,SyncSlivers,SyncSliverIps,SyncExternalRoutes,SyncUsers,SyncRoles,SyncNodes,SyncImages,GarbageCollector]
+       #sync_steps = [SyncNetworks,SyncNetworkSlivers,SyncSites,SyncSitePrivilege,SyncSlices,SyncSliceMemberships,SyncSlivers,SyncSliverIps,SyncExternalRoutes,SyncUsers,SyncRoles,SyncNodes,SyncImages,GarbageCollector]
        sync_steps = []
 
        
@@ -254,10 +254,13 @@ class PlanetStackObserver:
                except KeyError:
                        has_deps = False
 
+               go = False
+
                if (has_deps):
                        for d in deps:
                                 if d==step.__name__:
                                     logger.info("   step %s self-wait skipped" % step.__name__)
+                                   go = True
                                     continue
 
                                cond = self.step_conditions[d]
@@ -266,7 +269,7 @@ class PlanetStackObserver:
                                         logger.info("  step %s wait on dep %s" % (step.__name__, d))
                                        cond.wait()
                                cond.release()
-                       go = self.step_status[d] == STEP_STATUS_OK
+                       go = go or self.step_status[d] == STEP_STATUS_OK
                else:
                        go = True