From 7cb890b603ef36aeb8d03377fc00b73f0005245b Mon Sep 17 00:00:00 2001 From: Hao Liu Date: Mon, 6 Feb 2023 15:49:57 -0500 Subject: [PATCH] minor fix-up due to merge conflict --- awx/main/routing.py | 4 ++-- awx_collection/plugins/modules/project_update.py | 3 +-- tools/ansible/roles/dockerfile/templates/Dockerfile.j2 | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/awx/main/routing.py b/awx/main/routing.py index e45bf0a537..9625b23176 100644 --- a/awx/main/routing.py +++ b/awx/main/routing.py @@ -27,8 +27,8 @@ class AWXProtocolTypeRouter(ProtocolTypeRouter): websocket_urlpatterns = [ - re_path(r'websocket/$', consumers.EventConsumer), - re_path(r'websocket/relay/$', consumers.RelayConsumer), + re_path(r'websocket/$', consumers.EventConsumer.as_asgi()), + re_path(r'websocket/relay/$', consumers.RelayConsumer.as_asgi()), ] application = AWXProtocolTypeRouter( diff --git a/awx_collection/plugins/modules/project_update.py b/awx_collection/plugins/modules/project_update.py index 6cbcd39b6d..9d5a8841a7 100644 --- a/awx_collection/plugins/modules/project_update.py +++ b/awx_collection/plugins/modules/project_update.py @@ -116,8 +116,7 @@ def main(): if result['status_code'] == 405: module.fail_json( - msg="Unable to trigger a project update because the project scm_type ({0}) does not support it.".format(project['scm_type']), - response=result + msg="Unable to trigger a project update because the project scm_type ({0}) does not support it.".format(project['scm_type']), response=result ) elif result['status_code'] != 202: module.fail_json(msg="Failed to update project, see response for details", response=result) diff --git a/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 b/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 index c6fd7bf044..a74129905b 100644 --- a/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 +++ b/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 @@ -212,7 +212,6 @@ ADD tools/docker-compose/podman-containers.conf /var/lib/awx/.config/containers/ ADD tools/ansible/roles/dockerfile/files/launch_awx.sh /usr/bin/launch_awx.sh ADD tools/ansible/roles/dockerfile/files/launch_awx_task.sh /usr/bin/launch_awx_task.sh ADD tools/ansible/roles/dockerfile/files/launch_awx_rsyslog.sh /usr/bin/launch_awx_rsyslog.sh -ADD tools/ansible/roles/dockerfile/files/launch_awx_rsyslog.sh /usr/bin/launch_awx_cache_clear.sh ADD {{ template_dest }}/supervisor.conf /etc/supervisord.conf ADD {{ template_dest }}/supervisor_task.conf /etc/supervisord_task.conf ADD {{ template_dest }}/supervisor_rsyslog.conf /etc/supervisor_rsyslog.conf