From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Sun, 6 Oct 2013 15:05:49 +0000 (-0400)
Subject: enable user delete
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=9b6dde8dad7a771e5017488033453d9ac1f513a6;p=plstackapi.git

enable user delete
---

diff --git a/planetstack/observer/steps/garbage_collector.py b/planetstack/observer/steps/garbage_collector.py
index 4ed8506..8f5c57e 100644
--- a/planetstack/observer/steps/garbage_collector.py
+++ b/planetstack/observer/steps/garbage_collector.py
@@ -95,14 +95,14 @@ class GarbageCollector(OpenStackSyncStep):
             user_dict[user.kuser_id] = user
 
         # delete keystone users that don't have a user record
-        system_users = ['admin', 'nova', 'quantum', 'glance', 'cinder', 'swift', 'service']
+        system_users = ['admin', 'nova', 'quantum', 'glance', 'cinder', 'swift', 'service', 'demo']
         users = self.driver.shell.keystone.users.findall()
         for user in users:
             if user.name in system_users:
                 continue
             if user.id not in user_dict:
                 try:
-                    #self.driver.delete_user(user.id)
+                    self.driver.delete_user(user.id)
                     logger.info("deleted user: %s" % user)
                 except:
                     logger.log_exc("delete user failed: %s" % user)