fix bugs

[plstackapi.git] / planetstack / observer / steps / sync_users.py

diff --git a/planetstack/observer/steps/sync_users.py b/planetstack/observer/steps/sync_users.py
index af1bc30..25f093e 100644 (file)
--- a/planetstack/observer/steps/sync_users.py
+++ b/planetstack/observer/steps/sync_users.py
@@ -1,10 +1,19 @@
 import os
 import base64
+import hashlib
+from django.db.models import F, Q
 from planetstack.config import Config
+from observer.openstacksyncstep import OpenStackSyncStep
+from core.models.user import User
 
 class SyncUsers(OpenStackSyncStep):
-       provides=[User]
-       def sync_record(self, user):
+    provides=[User]
+    requested_interval=0
+
+    def fetch_pending(self):
+        return User.objects.filter(Q(enacted__lt=F('updated')) | Q(enacted=None))
+
+    def sync_record(self, user):
         name = user.email[:user.email.find('@')]
         user_fields = {'name': name,
                        'email': user.email,
@@ -14,7 +23,7 @@ class SyncUsers(OpenStackSyncStep):
             keystone_user = self.driver.create_user(**user_fields)
             user.kuser_id = keystone_user.id
         else:
-            self.driver.update_user(user.kuser_id, user_fields)     
+            self.driver.update_user(user.kuser_id, user_fields)        
 
         if user.site:
             self.driver.add_user_role(user.kuser_id, user.site.tenant_id, 'user')
@@ -25,8 +34,9 @@ class SyncUsers(OpenStackSyncStep):
                 self.driver.delete_user_role(user.kuser_id, user.site.tenant_id, 'admin')
 
         if user.public_key:
-            self.init_caller(user, user.site.login_base)
-            self.save_key(user.public_key, user.keyname)
-            self.init_admin()
+            driver = self.driver.client_driver(caller=user, tenant=user.site.login_base) 
+            key_fields =  {'name': user.keyname,
+                           'public_key': user.public_key}
+            driver.create_keypair(**key_fields)
 
         user.save()