diff --git a/group_vars/all.yml.dist b/group_vars/all.yml.dist index ebbe8c3d..5f51e058 100644 --- a/group_vars/all.yml.dist +++ b/group_vars/all.yml.dist @@ -196,6 +196,8 @@ ansible_nas_extra_packages: - unzip - lm-sensors +ansible_python_interpreter: /usr/bin/python3 + ### ### Samba ### diff --git a/inventory.dist b/inventory.dist index fa25055a..ae6484c9 100644 --- a/inventory.dist +++ b/inventory.dist @@ -3,8 +3,4 @@ # Example using from remote workstation # [all] -# 192.168.1.30 - -# Example using from remote without python2 on host -# [all] -# 192.168.1.30 ansible_python_interpreter=/usr/bin/python3 +# 192.168.1.30 \ No newline at end of file diff --git a/tasks/docker.yml b/tasks/docker.yml index 7d0b71d0..bfba1c6c 100644 --- a/tasks/docker.yml +++ b/tasks/docker.yml @@ -1,19 +1,10 @@ --- -- name: install pip - apt: - name: python-pip - state: present - register: result - until: result is succeeded - when: ansible_python_version < 3 - - name: install python3-pip apt: name: python3-pip state: present register: result until: result is succeeded - when: ansible_python_version >= 3 - name: 'Install docker-py' pip: