diff --git a/roles/container-engine/docker/tasks/main.yml b/roles/container-engine/docker/tasks/main.yml index f90e40d0fcdcf9bc783f90bc2202d79f2e0689c0..04bbd3bd0eddc6b2caafc0b9651335f132790a39 100644 --- a/roles/container-engine/docker/tasks/main.yml +++ b/roles/container-engine/docker/tasks/main.yml @@ -108,6 +108,17 @@ - ansible_distribution in ["CentOS","RedHat"] and not is_ostree - yum_result.results | length == 0 +- name: Remove dpkg hold + dpkg_selections: + name: "{{ item }}" + selection: install + when: ansible_pkg_mgr == 'apt' + changed_when: false + with_items: + - containerd + - docker-ce + - docker-ce-cli + - name: ensure docker packages are installed action: "{{ docker_package_info.pkg_mgr }}" args: @@ -142,7 +153,8 @@ dpkg_selections: name: "{{ item }}" selection: hold - when: ansible_os_family in ["Debian"] + when: ansible_pkg_mgr == 'apt' + changed_when: false with_items: - docker-ce - docker-ce-cli diff --git a/roles/container-engine/docker/vars/debian.yml b/roles/container-engine/docker/vars/debian.yml index 3819570b8d592be4ffd4ee4ba9e8b54b699f55c5..ce4605a8e27ccdb5530173afae9951240a179e2a 100644 --- a/roles/container-engine/docker/vars/debian.yml +++ b/roles/container-engine/docker/vars/debian.yml @@ -18,11 +18,8 @@ docker_package_info: pkg_mgr: apt pkgs: - name: "{{ containerd_versioned_pkg[containerd_version | string] }}" - force: yes - name: "{{ docker_cli_versioned_pkg[docker_cli_version | string] }}" - force: yes - name: "{{ docker_versioned_pkg[docker_version | string] }}" - force: yes docker_repo_key_info: pkg_key: apt_key diff --git a/roles/container-engine/docker/vars/ubuntu.yml b/roles/container-engine/docker/vars/ubuntu.yml index 8a4bdb46cf2eccb93600c14062ad8523da0f314e..0143695a370ad99cafe0f9c5bdf171b97ddd8370 100644 --- a/roles/container-engine/docker/vars/ubuntu.yml +++ b/roles/container-engine/docker/vars/ubuntu.yml @@ -18,11 +18,8 @@ docker_package_info: pkg_mgr: apt pkgs: - name: "{{ containerd_versioned_pkg[containerd_version | string] }}" - force: yes - name: "{{ docker_cli_versioned_pkg[docker_cli_version | string] }}" - force: yes - name: "{{ docker_versioned_pkg[docker_version | string] }}" - force: yes docker_repo_key_info: pkg_key: apt_key