tabs, bugfixes

[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 3f509ef..dde8a24 100644 (file)
--- a/planetstack/observer/steps/sync_users.py
+++ b/planetstack/observer/steps/sync_users.py
@@ -5,31 +5,32 @@ from observer.openstacksyncstep import OpenStackSyncStep
 from core.models.user import User
 
 class SyncUsers(OpenStackSyncStep):
-       provides=[User]
-       requested_interval=0
-       def sync_record(self, user):
-               name = user.email[:user.email.find('@')]
-               user_fields = {'name': name,
-                                          'email': user.email,
-                                          'password': hashlib.md5(user.password).hexdigest()[:6],
-                                          'enabled': True}
-               if not user.kuser_id:
-                       keystone_user = self.driver.create_user(**user_fields)
-                       user.kuser_id = keystone_user.id
-               else:
-                       self.driver.update_user(user.kuser_id, user_fields)             
+    provides=[User]
+    requested_interval=0
+    def sync_record(self, user):
+        name = user.email[:user.email.find('@')]
+        user_fields = {'name': name,
+                       'email': user.email,
+                       'password': hashlib.md5(user.password).hexdigest()[:6],
+                       'enabled': True}
+        if not user.kuser_id:
+            keystone_user = self.driver.create_user(**user_fields)
+            user.kuser_id = keystone_user.id
+        else:
+            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')
-                       if user.is_admin:
-                               self.driver.add_user_role(user.kuser_id, user.site.tenant_id, 'admin')
-                       else:
-                               # may have admin role so attempt to remove it
-                               self.driver.delete_user_role(user.kuser_id, user.site.tenant_id, 'admin')
+        if user.site:
+            self.driver.add_user_role(user.kuser_id, user.site.tenant_id, 'user')
+            if user.is_admin:
+                self.driver.add_user_role(user.kuser_id, user.site.tenant_id, 'admin')
+            else:
+                # may have admin role so attempt to remove it
+                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()
+        if user.public_key:
+            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()
+        user.save()