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
This commit is contained in:
Jan Dittberner 2014-05-30 12:17:04 +02:00
parent caab322beb
commit 1e717556ba
3 changed files with 9 additions and 2 deletions

View file

@ -284,6 +284,10 @@ BROKER_URL = get_env_variable('GVA_BROKER_URL')
CELERY_RESULT_BACKEND = 'amqp' CELERY_RESULT_BACKEND = 'amqp'
CELERY_RESULT_PERSISTENT = True CELERY_RESULT_PERSISTENT = True
CELERY_TASK_RESULT_EXPIRES = None CELERY_TASK_RESULT_EXPIRES = None
CELERY_ROUTES = {
'osusers.tasks.create_ldap_group': {'queue': 'ldap'},
'osusers.tasks.create_ldap_user': {'queue': 'ldap'},
}
########## END CELERY CONFIGURATION ########## END CELERY CONFIGURATION

View file

@ -5,9 +5,9 @@ from celery import shared_task
@shared_task @shared_task
def create_ldap_group(group): def create_ldap_group(group):
return group return group.groupname
@shared_task @shared_task
def create_ldap_user(user, password): def create_ldap_user(user, password):
return user, password return user.username

View file

@ -7,3 +7,6 @@ South==0.8.4
psycopg2==2.5.3 psycopg2==2.5.3
passlib==1.6.2 passlib==1.6.2
celery==3.1.11 celery==3.1.11
billiard==3.3.0.17
kombu==3.0.16
pytz==2014.3