From bc55bcf3a2aa3547cfa11aa6e3097b47b8abd0b0 Mon Sep 17 00:00:00 2001 From: Hao Liu Date: Wed, 29 Mar 2023 20:05:30 -0400 Subject: [PATCH] Rename SUPERVISOR_CONFIG_PATH previously this is used so that task running in the task container can reach into the web container to restart rsyslog now that the web container and task container are split there's no longer a way to do that so i renamed this env var to reference where it will now do which is pointing to the supervisor conf file of the current running container --- awx/main/constants.py | 2 +- awx/main/utils/reload.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/awx/main/constants.py b/awx/main/constants.py index 32d8a2184c..66666f875f 100644 --- a/awx/main/constants.py +++ b/awx/main/constants.py @@ -65,7 +65,7 @@ ENV_BLOCKLIST = frozenset( 'INVENTORY_HOSTVARS', 'AWX_HOST', 'PROJECT_REVISION', - 'SUPERVISOR_WEB_CONFIG_PATH', + 'SUPERVISOR_CONFIG_PATH', ) ) diff --git a/awx/main/utils/reload.py b/awx/main/utils/reload.py index a7c2a1ed99..29d0784f12 100644 --- a/awx/main/utils/reload.py +++ b/awx/main/utils/reload.py @@ -17,7 +17,7 @@ def supervisor_service_command(command, service='*', communicate=True): """ args = ['supervisorctl'] - supervisor_config_path = os.getenv('SUPERVISOR_WEB_CONFIG_PATH', None) + supervisor_config_path = os.getenv('SUPERVISOR_CONFIG_PATH', None) if supervisor_config_path: args.extend(['-c', supervisor_config_path])