Skip to content

Commit

Permalink
Fix attempt celery under python 3.8, see celery/celery#5761
Browse files Browse the repository at this point in the history
  • Loading branch information
stitch committed Sep 16, 2020
1 parent 83e2431 commit 9ac8512
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 0 deletions.
2 changes: 2 additions & 0 deletions code/puppet/modules/apps/manifests/websecmap/admin.pp
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@
# message broker settings
"BROKER=${broker}",
'STATSD_HOST=172.20.0.1',
# Fix Celery issue under Python 3.8, See: https://github.com/celery/celery/issues/5761
"COLUMNS=80",
]

# stateful configuration (credentials for external parties, eg: Sentry)
Expand Down
4 changes: 4 additions & 0 deletions code/puppet/modules/apps/manifests/websecmap/frontend.pp
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ $default_nowww_compliance = class_c,
"SERVICE_NAME=${appname}",
# standard consul HTTP check won't do because of Django ALLOWED_HOSTS
'SERVICE_CHECK_TCP=true',
# Fix Celery issue under Python 3.8, See: https://github.com/celery/celery/issues/5761
"COLUMNS=80",
],
env_file => ["/srv/${appname}/env.file", "/srv/${pod}/env.file"],
net => $pod,
Expand Down Expand Up @@ -123,6 +125,8 @@ $default_nowww_compliance = class_c,
"SERVICE_NAME=${pod}-interactive",
# standard consul HTTP check won't do because of Django ALLOWED_HOSTS
'SERVICE_CHECK_TCP=true',
# Fix Celery issue under Python 3.8, See: https://github.com/celery/celery/issues/5761
"COLUMNS=80",
],
env_file => ["/srv/${appname}/env.file", "/srv/${pod}/env.file"],
net => $pod,
Expand Down
4 changes: 4 additions & 0 deletions code/puppet/modules/apps/manifests/websecmap/worker.pp
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
'STATSD_HOST=172.20.0.1',
# indicate if this host is capable of running ipv6 tasks.
"NETWORK_SUPPORTS_IPV6=${ipv6_support}",
# Fix Celery issue under Python 3.8, See: https://github.com/celery/celery/issues/5761
"COLUMNS=80",
]

# stateful configuration (credentials for external parties, eg: Sentry)
Expand Down Expand Up @@ -68,6 +70,8 @@
# what tasks this worker should execute
"WORKER_ROLE=${role}",
"HOST_HOSTNAME=${::fqdn}",
# Fix Celery issue under Python 3.8, See: https://github.com/celery/celery/issues/5761
"COLUMNS=80",
],
env_file => ["/srv/${appname}/env.file", "/srv/${pod}/env.file"],
net => $pod,
Expand Down

0 comments on commit 9ac8512

Please sign in to comment.