Commit 18ec4754 authored by Markus Scheidgen's avatar Markus Scheidgen
Browse files

Enabled services for test.

parent 6dfefc92
Pipeline #36893 failed with stage
in 6 minutes and 7 seconds
...@@ -4,10 +4,10 @@ image: python:3.6 ...@@ -4,10 +4,10 @@ image: python:3.6
# additional services needed, the versions are matching the production machine # additional services needed, the versions are matching the production machine
# the services will be accessible under the hostnames: "postgres" and "mongo" # the services will be accessible under the hostnames: "postgres" and "mongo"
# services: services:
# - rabbitmq - rabbitmq
# - docker.elastic.co/elasticsearch/elasticsearch:6.3.2 - docker.elastic.co/elasticsearch/elasticsearch:6.3.2
# - mongo:latest - mongo:latest
variables: variables:
NOMAD_RABBIT_HOST: rabbitmq NOMAD_RABBIT_HOST: rabbitmq
......
...@@ -26,7 +26,7 @@ FilesConfig = namedtuple( ...@@ -26,7 +26,7 @@ FilesConfig = namedtuple(
""" API independent configuration for the object storage. """ """ API independent configuration for the object storage. """
CeleryConfig = namedtuple('Celery', ['broker_url']) 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']) FSConfig = namedtuple('FSConfig', ['tmp', 'objects'])
""" Used to configure file stystem access. """ """ Used to configure file stystem access. """
...@@ -54,10 +54,7 @@ rabbit_host = os.environ.get('NOMAD_RABBITMQ_HOST', 'localhost') ...@@ -54,10 +54,7 @@ rabbit_host = os.environ.get('NOMAD_RABBITMQ_HOST', 'localhost')
rabbit_port = os.environ.get('NOMAD_RABBITMQ_PORT', None) rabbit_port = os.environ.get('NOMAD_RABBITMQ_PORT', None)
rabbit_user = 'rabbitmq' rabbit_user = 'rabbitmq'
rabbit_password = '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) rabbit_url = 'pyamqp://%s:%s@%s//' % (rabbit_user, rabbit_password, rabbit_host)
redis_url = 'redis://%s/0' % redis_host
celery = CeleryConfig( celery = CeleryConfig(
broker_url=rabbit_url broker_url=rabbit_url
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment