Skip to content

Commit

Permalink
Merge pull request #25 from Diesel-Net/development
Browse files Browse the repository at this point in the history
Make compatible with Ansible-community 7.2.0
  • Loading branch information
tomdaley92 authored Apr 1, 2023
2 parents fac43f6 + 76a51a2 commit f1460ac
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 14 deletions.
2 changes: 1 addition & 1 deletion defaults/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ docker_registry_mirror: https://dockerhub.nexus.diesel.net
docker_file: '{{ playbook_dir }}/../Dockerfile'
docker_context: '{{ playbook_dir }}/..'

docker_ce_version: "5:20.10.14~3-0~{{ ansible_distribution | lower }}-{{ ansible_distribution_release | lower }}"
docker_ce_version: "5:20.10.17~3-0~{{ ansible_distribution | lower }}-{{ ansible_distribution_release | lower }}"

# apt-get pre-reqs for installing docker-ce
docker_ce_apt_deps:
Expand Down
4 changes: 0 additions & 4 deletions tasks/install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,10 @@
- name: extract and decompress {{ temp_dir.path }}/ldock.tar.gz
shell: >
tar -xvf {{ temp_dir.path }}/ldock.tar.gz -C {{ temp_dir.path }}
args:
warn: no
become: yes

- name: 'Rename lazydocker binary to ldock'
shell: mv {{ temp_dir.path }}/lazydocker /usr/local/bin/ldock
args:
warn: no
become: yes

- name: set ldock file permissions
Expand Down
2 changes: 0 additions & 2 deletions tasks/install_nvidia_toolkit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
curl -s -L
https://nvidia.github.io/nvidia-docker/{{ ansible_distribution | lower }}{{ ansible_distribution_version }}/nvidia-docker.list
| sudo tee /etc/apt/sources.list.d/nvidia-docker.list
args:
warn: no
- name: sudo apt update && sudo apt install nvidia-docker2
apt:
Expand Down
1 change: 0 additions & 1 deletion tasks/stack_deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,3 @@
shell: docker stack deploy --prune -c docker-compose.yaml {{ docker_stack }}
args:
chdir: '{{ config_dir }}'
warn: no
6 changes: 0 additions & 6 deletions tasks/stack_teardown.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@

- name: docker stack rm {{ docker_stack }}
shell: docker stack rm {{ docker_stack }}
args:
warn: no


- name: wait for {{ docker_stack }} services to be removed from swarm
Expand All @@ -20,8 +18,6 @@
sleep 1;
limit="$((limit-1))"
done
args:
warn: no
- name: wait for {{ docker_stack }} networks to be be removed from swarm
Expand All @@ -31,5 +27,3 @@
sleep 1;
limit="$((limit-1))"
done
args:
warn: no

0 comments on commit f1460ac

Please sign in to comment.