diff --git a/nomad/config.py b/nomad/config.py index fe2216434afb974472e5ce72876dc3745eeed423..0477ec2326df4800cb082b7b8219b700946cd761 100644 --- a/nomad/config.py +++ b/nomad/config.py @@ -87,20 +87,11 @@ rabbitmq = NomadConfig( password='rabbitmq' ) -redis = NomadConfig( - host='localhost', - port=6379, -) - def rabbitmq_url(): return 'pyamqp://%s:%s@%s//' % (rabbitmq.user, rabbitmq.password, rabbitmq.host) -def redis_url(): - return 'redis://%s:%d/0' % (redis.host, redis.port) - - celery = NomadConfig( max_memory=64e6, # 64 GB timeout=1800, # 1/2 h diff --git a/ops/docker-compose/infrastructure/docker-compose.override.yml b/ops/docker-compose/infrastructure/docker-compose.override.yml index 5d27a7a6be3aa3dcd4affb4409fe5de6be79ad9d..cb6b7a753f5a67790e7ff6d2ba439aa0b164f25e 100644 --- a/ops/docker-compose/infrastructure/docker-compose.override.yml +++ b/ops/docker-compose/infrastructure/docker-compose.override.yml @@ -26,12 +26,6 @@ services: ports: - 5672:5672 - # backend for celery - redis: - restart: 'no' - ports: - - 6379:6379 - # the search engine elastic: restart: 'no' diff --git a/ops/docker-compose/infrastructure/docker-compose.yml b/ops/docker-compose/infrastructure/docker-compose.yml index 38db2aad9464a3aa611d46019f0aae53976826f0..5912a3a2593e81d710fc1285b24c2632e1d71940 100644 --- a/ops/docker-compose/infrastructure/docker-compose.yml +++ b/ops/docker-compose/infrastructure/docker-compose.yml @@ -46,13 +46,6 @@ services: volumes: - nomad_rabbitmq:/var/lib/rabbitmq - # result backend for celery - redis: - restart: unless-stopped - image: redis:5.0.8-alpine - container_name: nomad_redis - command: [sh, -c, "rm -f /data/dump.rdb && redis-server --save ''"] # Disables db persistence to disk - # the search engine elastic: restart: always diff --git a/ops/helm/nomad/requirements.yaml b/ops/helm/nomad/requirements.yaml index 72b108bcfbbdc1f3f7ffb6b028c1391b90dff0f1..5a1951dda5c116d2788198d6ccc7b5f9b12f8013 100644 --- a/ops/helm/nomad/requirements.yaml +++ b/ops/helm/nomad/requirements.yaml @@ -2,6 +2,3 @@ dependencies: - name: rabbitmq version: "6.21.0" repository: "https://charts.bitnami.com/bitnami" -- name: redis - version: "10.6.9" - repository: "https://charts.bitnami.com/bitnami" diff --git a/ops/helm/nomad/templates/nomad-configmap.yml b/ops/helm/nomad/templates/nomad-configmap.yml index f05fdfd9ac06ca10dcfbfe7410fea84311fc36e7..480349fe12ad1a8c77b44ec4ebb1fff00581e361 100644 --- a/ops/helm/nomad/templates/nomad-configmap.yml +++ b/ops/helm/nomad/templates/nomad-configmap.yml @@ -29,8 +29,6 @@ data: admin_user_id: {{ .Values.keycloak.admin_user_id }} rabbitmq: host: "{{ .Release.Name }}-rabbitmq" - redis: - host: "{{ .Release.Name }}-redis-master" elastic: host: "{{ .Values.elastic.host }}" port: {{ .Values.elastic.port }} diff --git a/ops/helm/nomad/values.yaml b/ops/helm/nomad/values.yaml index 981ef039c4d62eb3aa4064ff7827a39dcae32db6..47ff4191fa75bbe939626623de126472deb8f3f2 100644 --- a/ops/helm/nomad/values.yaml +++ b/ops/helm/nomad/values.yaml @@ -100,18 +100,6 @@ rabbitmq: password: rabbitmq erlangCookie: SWQOKODSQALRPCLNMEQG -## configuration of the chart dependency for redis -redis: - cluster: - enabled: false - usePassword: false - master: - nodeSelector: - nomadtype: public - persistence: - enabled: false - - ## A common name/prefix for all dbs and indices. dbname: fairdi_nomad_latest