From 95da23e8b701ebddd532af2a60338cfab502a12b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Wed, 4 Oct 2023 10:36:42 +0200 Subject: [PATCH] agent: use wcs-manage to run hobo_deploy/notify commands (#81976) --- README | 2 +- debian/agent/settings.py | 2 +- debian/agent/sudo-hobo-agent | 4 ++-- hobo/agent/worker/settings.py | 2 +- tests_multitenant/test_agent_worker.py | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README b/README index 9b9db3f..a393bf9 100644 --- a/README +++ b/README @@ -139,7 +139,7 @@ Agents - w.c.s. -w.c.s. instances will be deployed using "/usr/bin/wcsctl" by default, this +w.c.s. instances will be deployed using "/usr/bin/wcs-manage" by default, this command can be adapted in the WCS_MANAGE_COMMAND setting. It should be run with the same rights as the wcs process (redefine the command to use sudo if necessary). diff --git a/debian/agent/settings.py b/debian/agent/settings.py index d870fcd..7786e37 100644 --- a/debian/agent/settings.py +++ b/debian/agent/settings.py @@ -17,7 +17,7 @@ BROKER_URL = 'amqp://' # *.dev.example.net. AGENT_HOST_PATTERNS = None -WCS_MANAGE_COMMAND = 'sudo -u wcs /usr/bin/wcsctl -f /etc/wcs/wcs.cfg' +WCS_MANAGE_COMMAND = 'sudo -u wcs /usr/bin/wcs-manage' AUTHENTIC_MANAGE_COMMAND = 'sudo -u authentic-multitenant /usr/bin/authentic2-multitenant-manage' COMBO_MANAGE_COMMAND = 'sudo -u combo /usr/bin/combo-manage' PASSERELLE_MANAGE_COMMAND = 'sudo -u passerelle /usr/bin/passerelle-manage' diff --git a/debian/agent/sudo-hobo-agent b/debian/agent/sudo-hobo-agent index 9ecb9cf..efebb43 100644 --- a/debian/agent/sudo-hobo-agent +++ b/debian/agent/sudo-hobo-agent @@ -1,4 +1,4 @@ -hobo-agent ALL=(wcs)NOPASSWD:/usr/bin/wcsctl -f /etc/wcs/wcs.cfg hobo_deploy * - +hobo-agent ALL=(wcs)NOPASSWD:/usr/bin/wcs-manage hobo_deploy * - hobo-agent ALL=(authentic-multitenant)NOPASSWD:/usr/bin/authentic2-multitenant-manage hobo_deploy * - hobo-agent ALL=(combo)NOPASSWD:/usr/bin/combo-manage hobo_deploy * - hobo-agent ALL=(passerelle)NOPASSWD:/usr/bin/passerelle-manage hobo_deploy * - @@ -9,7 +9,7 @@ hobo-agent ALL=(bijoe)NOPASSWD:/usr/bin/bijoe-manage hobo_deploy * - hobo-agent ALL=(hobo)NOPASSWD:/usr/bin/hobo-manage hobo_deploy * - hobo-agent ALL=(lingo)NOPASSWD:/usr/bin/lingo-manage hobo_deploy * - -hobo-agent ALL=(wcs)NOPASSWD:/usr/bin/wcsctl -f /etc/wcs/wcs.cfg hobo_notify - +hobo-agent ALL=(wcs)NOPASSWD:/usr/bin/wcs-manage hobo_notify - hobo-agent ALL=(authentic-multitenant)NOPASSWD:/usr/bin/authentic2-multitenant-manage hobo_notify - hobo-agent ALL=(combo)NOPASSWD:/usr/bin/combo-manage hobo_notify - hobo-agent ALL=(passerelle)NOPASSWD:/usr/bin/passerelle-manage hobo_notify - diff --git a/hobo/agent/worker/settings.py b/hobo/agent/worker/settings.py index 27a9216..c507e91 100644 --- a/hobo/agent/worker/settings.py +++ b/hobo/agent/worker/settings.py @@ -17,7 +17,7 @@ BROKER_URL = 'amqp://' # *.dev.example.net. AGENT_HOST_PATTERNS = None -WCS_MANAGE_COMMAND = '/usr/bin/wcsctl' +WCS_MANAGE_COMMAND = '/usr/bin/wcs-manage' AUTHENTIC_MANAGE_COMMAND = '/usr/bin/authentic2-multitenant-manage' COMBO_MANAGE_COMMAND = '/usr/lib/combo/manage.py' PASSERELLE_MANAGE_COMMAND = '/usr/lib/passerelle/manage.py' diff --git a/tests_multitenant/test_agent_worker.py b/tests_multitenant/test_agent_worker.py index 72d0b56..4293807 100644 --- a/tests_multitenant/test_agent_worker.py +++ b/tests_multitenant/test_agent_worker.py @@ -104,7 +104,7 @@ def test_deploy(mocked_subprocess, mocked_exists): mock_calls = {x[1][0] for x in mocked_subprocess.Popen.mock_calls} assert len(mock_calls) == 4 assert '/usr/bin/hobo-manage hobo_deploy https://hobo1.dev.publik.love/ -' in mock_calls - assert '/usr/bin/wcsctl hobo_deploy https://wcs.dev.publik.love/ -' in mock_calls + assert '/usr/bin/wcs-manage hobo_deploy https://wcs.dev.publik.love/ -' in mock_calls assert '/usr/lib/combo/manage.py hobo_deploy https://combo.dev.publik.love/ -' in mock_calls assert '/usr/bin/hobo-manage hobo_deploy https://hobo2.dev.publik.love/ -' in mock_calls @@ -138,7 +138,7 @@ def test_deploy_host_with_agent_patterns(mocked_subprocess, mocked_exists, local mock_calls = {x[1][0] for x in mocked_subprocess.Popen.mock_calls} assert len(mock_calls) == 3 assert '/usr/bin/hobo-manage hobo_deploy https://hobo1.dev.publik.love/ -' in mock_calls - assert '/usr/bin/wcsctl hobo_deploy https://wcs.dev.publik.love/ -' in mock_calls + assert '/usr/bin/wcs-manage hobo_deploy https://wcs.dev.publik.love/ -' in mock_calls assert '/usr/lib/combo/manage.py hobo_deploy https://combo.dev.publik.love/ -' in mock_calls