entrouvert
/
hobo
16
0
Fork 0
Code Issues Pull Requests 18 Releases Activity

agent: use wcs-manage to run hobo_deploy/notify commands (#81976)
gitea/hobo/pipeline/head This commit looks good Details

This commit is contained in:
Frédéric Péters 2023-10-04 10:36:42 +02:00
parent dd16a73f55
commit 95da23e8b7
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README
View File

@ -139,7 +139,7 @@ Agents
- w.c.s. - 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 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 with the same rights as the wcs process (redefine the command to use sudo
if necessary). if necessary).

2
debian/agent/settings.py vendored
View File

@ -17,7 +17,7 @@ BROKER_URL = 'amqp://'
# *.dev.example.net. # *.dev.example.net.
AGENT_HOST_PATTERNS = None 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' AUTHENTIC_MANAGE_COMMAND = 'sudo -u authentic-multitenant /usr/bin/authentic2-multitenant-manage'
COMBO_MANAGE_COMMAND = 'sudo -u combo /usr/bin/combo-manage' COMBO_MANAGE_COMMAND = 'sudo -u combo /usr/bin/combo-manage'
PASSERELLE_MANAGE_COMMAND = 'sudo -u passerelle /usr/bin/passerelle-manage' PASSERELLE_MANAGE_COMMAND = 'sudo -u passerelle /usr/bin/passerelle-manage'

4
debian/agent/sudo-hobo-agent vendored
View File

@ -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=(authentic-multitenant)NOPASSWD:/usr/bin/authentic2-multitenant-manage hobo_deploy * -
hobo-agent ALL=(combo)NOPASSWD:/usr/bin/combo-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 * - 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=(hobo)NOPASSWD:/usr/bin/hobo-manage hobo_deploy * -
hobo-agent ALL=(lingo)NOPASSWD:/usr/bin/lingo-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=(authentic-multitenant)NOPASSWD:/usr/bin/authentic2-multitenant-manage hobo_notify -
hobo-agent ALL=(combo)NOPASSWD:/usr/bin/combo-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 - hobo-agent ALL=(passerelle)NOPASSWD:/usr/bin/passerelle-manage hobo_notify -

2
hobo/agent/worker/settings.py
View File

@ -17,7 +17,7 @@ BROKER_URL = 'amqp://'
# *.dev.example.net. # *.dev.example.net.
AGENT_HOST_PATTERNS = None 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' AUTHENTIC_MANAGE_COMMAND = '/usr/bin/authentic2-multitenant-manage'
COMBO_MANAGE_COMMAND = '/usr/lib/combo/manage.py' COMBO_MANAGE_COMMAND = '/usr/lib/combo/manage.py'
PASSERELLE_MANAGE_COMMAND = '/usr/lib/passerelle/manage.py' PASSERELLE_MANAGE_COMMAND = '/usr/lib/passerelle/manage.py'

4
tests_multitenant/test_agent_worker.py
View File

@ -104,7 +104,7 @@ def test_deploy(mocked_subprocess, mocked_exists):
mock_calls = {x[1][0] for x in mocked_subprocess.Popen.mock_calls} mock_calls = {x[1][0] for x in mocked_subprocess.Popen.mock_calls}
assert len(mock_calls) == 4 assert len(mock_calls) == 4
assert '/usr/bin/hobo-manage hobo_deploy https://hobo1.dev.publik.love/ -' in mock_calls 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/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 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} mock_calls = {x[1][0] for x in mocked_subprocess.Popen.mock_calls}
assert len(mock_calls) == 3 assert len(mock_calls) == 3
assert '/usr/bin/hobo-manage hobo_deploy https://hobo1.dev.publik.love/ -' in mock_calls 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/lib/combo/manage.py hobo_deploy https://combo.dev.publik.love/ -' in mock_calls