X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fopenstack%2Fobserver.py;h=44908ab6ee3ce1d7b70a00269c68226a003fb2a2;hb=aa8ad5ffd286f959f11c602815887912cc208739;hp=c14b2cb836bccd2ad1e68fbcbb85c02cfbd7eded;hpb=79a49c87e1ef80e7ea6d2052e681066bb67820d9;p=plstackapi.git

diff --git a/planetstack/openstack/observer.py b/planetstack/openstack/observer.py
index c14b2cb..44908ab 100644
--- a/planetstack/openstack/observer.py
+++ b/planetstack/openstack/observer.py
@@ -105,7 +105,7 @@ class OpenStackObserver:
         tenants = self.manager.driver.shell.keystone.tenants.findall()
         system_tenants = ['admin','service']
         for tenant in tenants:
-            if tenant.name == 'admin': 
+            if tenant.name in system_tenants: 
                 continue
             if tenant.name not in site_dict and tenant.name not in slice_dict:
                 try:
@@ -235,7 +235,7 @@ class OpenStackObserver:
                 except:
                     logger.log_exc("save sliver failed: %s" % sliver) 
 
-        # get all slivers that where enacted != null. We can assume these users
+        # get all slivers where enacted != null. We can assume these users
         # have previously been synced and need to be checed for deletion.
         slivers = Sliver.objects.filter(enacted__isnull=False)
         sliver_dict = {}
@@ -246,12 +246,12 @@ class OpenStackObserver:
         ctx = self.manager.driver.shell.nova_db.ctx 
         instances = self.manager.driver.shell.nova_db.instance_get_all(ctx)
         for instance in instances:
-            if instance.id not in sliver_dict:
+            if instance.uuid not in sliver_dict:
                 try:
                     # lookup tenant and update context  
                     tenant = self.manager.driver.shell.keystone.tenants.find(id=instance.project_id) 
                     self.manager.init_admin(tenant=tenant.name)  
-                    self.manager.driver.destroy_instance(instance.id)
+                    self.manager.driver.destroy_instance(instance.uuid)
                     logger.info("destroyed sliver: %s" % (instance))
                 except:
                     logger.log_exc("destroy sliver failed: %s" % instance)