From 28231e4bf154bd639597e3073e2f74657625b784 Mon Sep 17 00:00:00 2001 From: Adrien Date: Tue, 9 Oct 2018 15:27:44 +0200 Subject: [PATCH] Fix for distrib dicker version --- defaults/main.yml | 6 ++++-- tasks/Debian.yml | 4 ++-- vars/RedHat_docker.yml | 7 +++++++ 3 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 vars/RedHat_docker.yml diff --git a/defaults/main.yml b/defaults/main.yml index ec5a90a..c42542b 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,5 +1,7 @@ --- -# Possible value: docker-ce , docker-io -docker_ver: docker-ce +# Possible value: docker_ce , docker +# docker_ce : official docker comunity edition +# docker : distribution version +docker_ver: docker_ce docker_swarmmode: false docker_swarm_port: 2377 diff --git a/tasks/Debian.yml b/tasks/Debian.yml index 0edd5df..14320d0 100644 --- a/tasks/Debian.yml +++ b/tasks/Debian.yml @@ -4,12 +4,12 @@ url: https://download.docker.com/linux/ubuntu/gpg state: present when: - - docker_ver == "docker-ce" + - docker_ver == "docker_ce" - name: add docker repository apt_repository: repo='deb [arch=amd64] https://download.docker.com/linux/ubuntu {{ansible_distribution_release}} stable' state=present update_cache=yes when: - - docker_ver == "docker-ce" + - docker_ver == "docker_ce" - name: "Ensure GRUB_CMDLINE_LINUX is updated" lineinfile: dest=/etc/default/grub regexp='^(GRUB_CMDLINE_LINUX=".*)"$' line='\1 cgroup_enable=memory swapaccount=1"' backrefs=yes diff --git a/vars/RedHat_docker.yml b/vars/RedHat_docker.yml new file mode 100644 index 0000000..ba8080b --- /dev/null +++ b/vars/RedHat_docker.yml @@ -0,0 +1,7 @@ +--- +docker_package_name: + - docker +docker_remove_packages_name: + - docker-ce +docker_python_lib: + - python-docker-py