From 1e717556ba18b5fe2af1ce2308c120d063c5762a Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jan@dittberner.info>
Date: Fri, 30 May 2014 12:17:04 +0200
Subject: [PATCH] refine ldap create commands

- define gnuviechadmin.settins.base.CELERY_ROUTES to properly route ldap tasks
- return dummy values from osusers.tasks
- add billiard, kombu and pytz to requirements/base.txt
---
 gnuviechadmin/gnuviechadmin/settings/base.py | 4 ++++
 gnuviechadmin/osusers/tasks.py               | 4 ++--
 requirements/base.txt                        | 3 +++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/gnuviechadmin/gnuviechadmin/settings/base.py b/gnuviechadmin/gnuviechadmin/settings/base.py
index 768ce96..e9a7e8d 100644
--- a/gnuviechadmin/gnuviechadmin/settings/base.py
+++ b/gnuviechadmin/gnuviechadmin/settings/base.py
@@ -284,6 +284,10 @@ BROKER_URL = get_env_variable('GVA_BROKER_URL')
 CELERY_RESULT_BACKEND = 'amqp'
 CELERY_RESULT_PERSISTENT = True
 CELERY_TASK_RESULT_EXPIRES = None
+CELERY_ROUTES = {
+    'osusers.tasks.create_ldap_group': {'queue': 'ldap'},
+    'osusers.tasks.create_ldap_user': {'queue': 'ldap'},
+}
 ########## END CELERY CONFIGURATION
 
 
diff --git a/gnuviechadmin/osusers/tasks.py b/gnuviechadmin/osusers/tasks.py
index 7382c99..33af75f 100644
--- a/gnuviechadmin/osusers/tasks.py
+++ b/gnuviechadmin/osusers/tasks.py
@@ -5,9 +5,9 @@ from celery import shared_task
 
 @shared_task
 def create_ldap_group(group):
-    return group
+    return group.groupname
 
 
 @shared_task
 def create_ldap_user(user, password):
-    return user, password
+    return user.username
diff --git a/requirements/base.txt b/requirements/base.txt
index a4cc9be..adc811d 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -7,3 +7,6 @@ South==0.8.4
 psycopg2==2.5.3
 passlib==1.6.2
 celery==3.1.11
+billiard==3.3.0.17
+kombu==3.0.16
+pytz==2014.3