From 9a43cc02e0a5b46670d13c7a2c5f8388e7ba3046 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Fri, 17 Apr 2020 09:45:35 +0300
Subject: [PATCH] Only install docker-python if
 matrix_docker_installation_enabled

Should help with #300 (Github Issue).
---
 roles/matrix-base/tasks/server_base/setup_centos.yml | 2 +-
 roles/matrix-base/tasks/server_base/setup_debian.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/roles/matrix-base/tasks/server_base/setup_centos.yml b/roles/matrix-base/tasks/server_base/setup_centos.yml
index 77b2866a..07776d7f 100644
--- a/roles/matrix-base/tasks/server_base/setup_centos.yml
+++ b/roles/matrix-base/tasks/server_base/setup_centos.yml
@@ -20,7 +20,6 @@
 - name: Ensure yum packages are installed
   yum:
     name:
-      - docker-python
       - "{{ matrix_ntpd_package }}"
       - fuse
     state: latest
@@ -30,5 +29,6 @@
   yum:
     name:
       - "{{ matrix_docker_package_name }}"
+      - docker-python
     state: latest
   when: matrix_docker_installation_enabled|bool
diff --git a/roles/matrix-base/tasks/server_base/setup_debian.yml b/roles/matrix-base/tasks/server_base/setup_debian.yml
index c54b3cb6..88ea1c1d 100644
--- a/roles/matrix-base/tasks/server_base/setup_debian.yml
+++ b/roles/matrix-base/tasks/server_base/setup_debian.yml
@@ -27,7 +27,6 @@
 - name: Ensure APT packages are installed
   apt:
     name:
-      - "python{{'3' if ansible_python.version.major == 3 else ''}}-docker"
       - "{{ matrix_ntpd_package }}"
       - fuse
     state: latest
@@ -37,5 +36,6 @@
   apt:
     name:
       - "{{ matrix_docker_package_name }}"
+      - "python{{'3' if ansible_python.version.major == 3 else ''}}-docker"
     state: latest
   when: matrix_docker_installation_enabled|bool