ansol/matrix-docker-ansible-deploy
7
0
Fork 0
mirror of https://github.com/spantaleev/matrix-docker-ansible-deploy.git synced 2024-12-22 20:45:48 +00:00
Code Issues Projects Releases Wiki Activity

Only install docker-python if matrix_docker_installation_enabled

Browse Source 
Should help with #300 (Github Issue).
This commit is contained in:
Slavi Pantaleev 2020-04-17 09:45:35 +03:00
parent 4d260c0dd5
commit 9a43cc02e0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/matrix-base/tasks/server_base/setup_centos.yml
View File

@ -20,7 +20,6 @@
- name: Ensure yum packages are installed - name: Ensure yum packages are installed
yum: yum:
name: name:
- docker-python
- "{{ matrix_ntpd_package }}" - "{{ matrix_ntpd_package }}"
- fuse - fuse
state: latest state: latest
@ -30,5 +29,6 @@
yum: yum:
name: name:
- "{{ matrix_docker_package_name }}" - "{{ matrix_docker_package_name }}"
- docker-python
state: latest state: latest
when: matrix_docker_installation_enabled|bool when: matrix_docker_installation_enabled|bool

2
roles/matrix-base/tasks/server_base/setup_debian.yml
View File

@ -27,7 +27,6 @@
- name: Ensure APT packages are installed - name: Ensure APT packages are installed
apt: apt:
name: name:
- "python{{'3' if ansible_python.version.major == 3 else ''}}-docker"
- "{{ matrix_ntpd_package }}" - "{{ matrix_ntpd_package }}"
- fuse - fuse
state: latest state: latest
@ -37,5 +36,6 @@
apt: apt:
name: name:
- "{{ matrix_docker_package_name }}" - "{{ matrix_docker_package_name }}"
- "python{{'3' if ansible_python.version.major == 3 else ''}}-docker"
state: latest state: latest
when: matrix_docker_installation_enabled|bool when: matrix_docker_installation_enabled|bool