From 88171aaee76f350242470344e86117b41d6a6128 Mon Sep 17 00:00:00 2001
From: dandds <dan-ctr@friends.dds.mil>
Date: Thu, 14 Nov 2019 15:48:14 -0500
Subject: [PATCH] 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.
---
 config/base.ini                                |  1 +
 deploy/azure/atst-envvars-configmap.yml        | 11 ++++++-----
 deploy/azure/atst-worker-envvars-configmap.yml |  5 +++--
 deploy/overlays/staging/envvars.yml            | 14 ++++++++++++++
 deploy/overlays/staging/kustomization.yaml     |  1 +
 5 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 deploy/overlays/staging/envvars.yml

diff --git a/config/base.ini b/config/base.ini
index 31157749..b68e526c 100644
--- a/config/base.ini
+++ b/config/base.ini
@@ -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
diff --git a/deploy/azure/atst-envvars-configmap.yml b/deploy/azure/atst-envvars-configmap.yml
index 6d1b9463..b521e8d2 100644
--- a/deploy/azure/atst-envvars-configmap.yml
+++ b/deploy/azure/atst-envvars-configmap.yml
@@ -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
diff --git a/deploy/azure/atst-worker-envvars-configmap.yml b/deploy/azure/atst-worker-envvars-configmap.yml
index 25ca0e5a..c3522f70 100644
--- a/deploy/azure/atst-worker-envvars-configmap.yml
+++ b/deploy/azure/atst-worker-envvars-configmap.yml
@@ -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
diff --git a/deploy/overlays/staging/envvars.yml b/deploy/overlays/staging/envvars.yml
new file mode 100644
index 00000000..f7bdd6b9
--- /dev/null
+++ b/deploy/overlays/staging/envvars.yml
@@ -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
diff --git a/deploy/overlays/staging/kustomization.yaml b/deploy/overlays/staging/kustomization.yaml
index 9ecb975d..83450cf5 100644
--- a/deploy/overlays/staging/kustomization.yaml
+++ b/deploy/overlays/staging/kustomization.yaml
@@ -6,6 +6,7 @@ resources:
 patchesStrategicMerge:
   - replica_count.yml
   - ports.yml
+  - envvars.yml
 patchesJson6902:
   - target:
       group: extensions