From cfc845b45e90082ada9c9d0da70f9f169a8a5166 Mon Sep 17 00:00:00 2001 From: Antonis Christofides Date: Mon, 5 Jun 2023 19:59:27 +0300 Subject: [PATCH] Ensure docker is installed on additional JVBs (fixes #2706) This contribution is provided by GRNET S.A. (grnet.gr). --- group_vars/jitsi_jvb_servers | 2 ++ jitsi_jvb.yml | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/group_vars/jitsi_jvb_servers b/group_vars/jitsi_jvb_servers index 84009e2ca..af927c9f1 100644 --- a/group_vars/jitsi_jvb_servers +++ b/group_vars/jitsi_jvb_servers @@ -7,3 +7,5 @@ devture_systemd_service_manager_services_list_auto: | {{ ([{'name': (jitsi_identifier + '-jvb.service'), 'priority': 4100, 'groups': ['matrix', 'jitsi', 'jitsi-jvb']}] if jitsi_enabled else []) }} + +matrix_playbook_docker_installation_enabled: true diff --git a/jitsi_jvb.yml b/jitsi_jvb.yml index 1ea63855a..16acd0ee6 100644 --- a/jitsi_jvb.yml +++ b/jitsi_jvb.yml @@ -7,6 +7,26 @@ - role: galaxy/com.devture.ansible.role.playbook_help - role: galaxy/com.devture.ansible.role.systemd_docker_base + - when: matrix_playbook_docker_installation_enabled | bool + role: galaxy/geerlingguy.docker + vars: + docker_install_compose: false + tags: + - setup-docker + - setup-all + - setup-additional-jitsi-jvb + - install-docker + - install-all + + - when: devture_docker_sdk_for_python_installation_enabled | bool + role: galaxy/com.devture.ansible.role.docker_sdk_for_python + tags: + - setup-docker + - setup-all + - setup-additional-jitsi-jvb + - install-docker + - install-all + - custom/matrix-base - galaxy/jitsi - custom/matrix-common-after