Merge pull request #1185 from dod-ccpo/celery-queues

Supply named default queue for Celery.

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

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

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

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

deploy/overlays/staging/kustomization.yaml

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