diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fcc02bf49a5723e0e22b86aa451710d6cf770b70..a03708a9c59a3d201b3299906d3b035111fe3ee0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,10 +4,10 @@ image: python:3.6 # additional services needed, the versions are matching the production machine # the services will be accessible under the hostnames: "postgres" and "mongo" -# services: -# - rabbitmq -# - docker.elastic.co/elasticsearch/elasticsearch:6.3.2 -# - mongo:latest +services: + - rabbitmq + - docker.elastic.co/elasticsearch/elasticsearch:6.3.2 + - mongo:latest variables: NOMAD_RABBIT_HOST: rabbitmq diff --git a/nomad/config.py b/nomad/config.py index db1ed869ff94c187ebfd41c1e63ebc4dfa604ce7..7d8f5f3bc6eb391b2d5c799c1e8e40f2ce492a9d 100644 --- a/nomad/config.py +++ b/nomad/config.py @@ -26,7 +26,7 @@ FilesConfig = namedtuple( """ API independent configuration for the object storage. """ CeleryConfig = namedtuple('Celery', ['broker_url']) -""" Used to configure the RabbitMQ and Redis backends for celery. """ +""" Used to configure the RabbitMQ for celery. """ FSConfig = namedtuple('FSConfig', ['tmp', 'objects']) """ Used to configure file stystem access. """ @@ -54,10 +54,7 @@ rabbit_host = os.environ.get('NOMAD_RABBITMQ_HOST', 'localhost') rabbit_port = os.environ.get('NOMAD_RABBITMQ_PORT', None) rabbit_user = 'rabbitmq' rabbit_password = 'rabbitmq' -redis_host = os.environ.get('NOMAD_REDIS_HOST', 'localhost') - rabbit_url = 'pyamqp://%s:%s@%s//' % (rabbit_user, rabbit_password, rabbit_host) -redis_url = 'redis://%s/0' % redis_host celery = CeleryConfig( broker_url=rabbit_url