Merge pull request 'Ansible should use libssh for persistent connections' (#5) from feature/ansible-use-libssh-for-persistent-connections into master

Reviewed-on: #5

ansible.cfg

@@ -19,3 +19,6 @@ ssh_args = -o ControlMaster=auto -o ControlPersist=600s -o ServerAliveInterval=6
 control_path = %(directory)s/%%h-%%r
 pipelining = True
 timeout = 10
+
+[persistent_connection]
+ssh_type = libssh

docker.yml

@@ -3,7 +3,9 @@
 
 - hosts: docker
   become: true
+  pre_tasks:
+    - name: Install pip packages for Docker
+      ansible.builtin.pip: 
+        name: "{{ pip_install_packages }}"
   roles:
-    - geerlingguy.pip
-    - geerlingguy.docker
     - jotbe.traefik-docker

group_vars/docker.yml

@@ -1,11 +1,6 @@
-pip_package: python3-pip
+#pip_package: python3-pip
 pip_install_packages:
-  - name: docker
-  - name: docker-compose
-docker_edition: "ce"
-docker_version: "19.03.5"
-docker_package: "docker-{{ docker_edition }}"
-docker_package_state: present
-docker_compose_version: "1.25.0"
+  - docker
+  - docker-compose
 docker_users:
   - deploy

requirements.yml

@@ -1,28 +1,35 @@
-- geerlingguy.firewall
-- geerlingguy.pip
-- geerlingguy.docker
+collections:
+  - community.docker
 
-- name: jotbe.common
+roles:
+  - geerlingguy.firewall
+  - geerlingguy.pip
+  # - geerlingguy.docker
+
+  - name: jotbe.common
     src: https://git.jotbe.io/jotbe/ansible-role-common.git
     scm: git
-- name: jotbe.traefik-docker
+  - name: jotbe.traefik-docker
     src: https://git.jotbe.io/jotbe/ansible-role-traefik-docker.git
     scm: git
-- name: jotbe.nextcloud-docker
+  - name: jotbe.nextcloud-docker
+    version: v1.0.2
     src: https://git.jotbe.io/jotbe/ansible-role-nextcloud-docker.git
     scm: git
-- name: jotbe.coturn-docker
+  - name: jotbe.coturn-docker
     src: https://git.jotbe.io/jotbe/ansible-role-coturn-docker.git
     scm: git
-- name: jotbe.jitsi-docker
+  - name: jotbe.jitsi-docker
+    version: v1.0.0
     src: https://git.jotbe.io/jotbe/ansible-role-jitsi-docker.git
     scm: git
-- name: jotbe.collabora-online-docker
+  - name: jotbe.collabora-online-docker
+    version: v1.0.0
     src: https://git.jotbe.io/jotbe/ansible-role-collabora-online-docker.git
     scm: git
-- name: jotbe.onlyoffice-document-server-docker
+  - name: jotbe.onlyoffice-document-server-docker
     src: https://git.jotbe.io/jotbe/ansible-role-onlyoffice-document-server-docker.git
     scm: git
-- name: jotbe.cryptpad-docker
+  - name: jotbe.cryptpad-docker
     src: https://git.jotbe.io/jotbe/ansible-role-cryptpad-docker.git
     scm: git