Commit 88778a32 by Bach Dániel

Merge branch 'feature-fix-celery' into 'master'

Feature fix celery

See merge request !7
parents 94b6493c d04f15e2
......@@ -77,7 +77,6 @@ Save configuration to virtualenv and activate environment::
export LIBVIRT_URI=test:///default
export AMQP_URI=amqp://cloud:password@$(hostname)/circle
export HYPERVISOR_TYPE=test
export CACHE_URI=pylibmc://$(hostname):11211/
END
Copy the libvrit bindings to the local virtualenv directory::
......
......@@ -17,7 +17,6 @@ if HOSTNAME is None:
"Hostname format must be hostname.module.priority.")
AMQP_URI = getenv('AMQP_URI')
CACHE_URI = getenv('CACHE_URI')
def to_bool(value):
......@@ -37,8 +36,7 @@ celery = Celery('netcelery',
include=['netdriver'])
celery.conf.update(
CELERY_RESULT_BACKEND='cache',
CELERY_CACHE_BACKEND=CACHE_URI,
CELERY_RESULT_BACKEND='amqp',
CELERY_TASK_RESULT_EXPIRES=300,
CELERY_QUEUES=(
Queue(HOSTNAME, Exchange(
......
celery==3.0.23
celery==3.1.17
decorator==3.4.0
lxml==3.2.3
lxml==3.4.2
psutil==1.1.3
Pillow==2.3.0
pylibmc==1.2.3
GitPython
GitPython==0.3.6
......@@ -24,7 +24,6 @@ else:
"Hostname format must be hostname.module.priority.")
AMQP_URI = getenv('AMQP_URI')
CACHE_URI = getenv('CACHE_URI')
# Global configuration parameters declaration
......@@ -42,8 +41,7 @@ celery = Celery('vmcelery',
include=['vmdriver'])
celery.conf.update(
CELERY_RESULT_BACKEND='cache',
CELERY_CACHE_BACKEND=CACHE_URI,
CELERY_RESULT_BACKEND='amqp',
CELERY_TASK_RESULT_EXPIRES=300,
CELERY_QUEUES=(
Queue(HOSTNAME, Exchange(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment