Supply named default queue for Celery.

Supplying this will prevent queue clashes between various ATAT sites
sharing the same Redis instance.

Note that the Celery documentation is currently wrong about the name for
configuring this:

https://docs.celeryproject.org/en/latest/userguide/configuration.html#std:setting-task_default_queue

It specifies `CELERY_TASK_DEFAULT_QUEUE`, but
`CELERY_DEFAULT_QUEUE` is the value that Celery currently looks for.
This appears to be fixed in on an upcoming release:

https://github.com/celery/celery/issues/5575

This is worth keeping an eye on, since the configuration key could
change in the future.
This commit is contained in:
dandds 2019-11-14 15:48:14 -05:00
parent bf1badeff0
commit 88171aaee7
5 changed files with 25 additions and 7 deletions

View File

@ -5,6 +5,7 @@ CA_CHAIN = ssl/server-certs/ca-chain.pem
CLASSIFIED = false
CONTRACT_START_DATE = 2019-09-14
CONTRACT_END_DATE = 2022-09-14
CELERY_DEFAULT_QUEUE=celery
DISABLE_CRL_CHECK = false
CRL_FAIL_OPEN = false
CRL_STORAGE_CONTAINER = crls

View File

@ -5,11 +5,12 @@ metadata:
name: atst-envvars
namespace: atat
data:
TZ: UTC
FLASK_ENV: dev
OVERRIDE_CONFIG_FULLPATH: /opt/atat/atst/atst-overrides.ini
UWSGI_CONFIG_FULLPATH: /opt/atat/atst/uwsgi.ini
LOG_JSON: "true"
CSP: azure
CELERY_DEFAULT_QUEUE: celery-master
FLASK_ENV: dev
LOG_JSON: "true"
OVERRIDE_CONFIG_FULLPATH: /opt/atat/atst/atst-overrides.ini
PGSSLMODE: verify-full
PGSSLROOTCERT: /opt/atat/atst/ssl/pgsslrootcert.crt
TZ: UTC
UWSGI_CONFIG_FULLPATH: /opt/atat/atst/uwsgi.ini

View File

@ -5,8 +5,9 @@ metadata:
name: atst-worker-envvars
namespace: atat
data:
TZ: UTC
CELERY_DEFAULT_QUEUE: celery-master
DISABLE_CRL_CHECK: "True"
SERVER_NAME: azure.atat.code.mil
PGSSLMODE: verify-full
PGSSLROOTCERT: /opt/atat/atst/ssl/pgsslrootcert.crt
SERVER_NAME: azure.atat.code.mil
TZ: UTC

View File

@ -0,0 +1,14 @@
---
apiVersion: v1
kind: ConfigMap
metadata:
name: atst-worker-envvars
data:
CELERY_DEFAULT_QUEUE: celery-staging
---
apiVersion: v1
kind: ConfigMap
metadata:
name: atst-envvars
data:
CELERY_DEFAULT_QUEUE: celery-staging

View File

@ -6,6 +6,7 @@ resources:
patchesStrategicMerge:
- replica_count.yml
- ports.yml
- envvars.yml
patchesJson6902:
- target:
group: extensions