diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index 6126418f14d2afee9f8343efe7cef6cc024a6e61..03db20c7537da0d9f22219939ff34c7d717fa3e2 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -48,7 +48,8 @@ - name: ensure docker packages are installed action: "{{ docker_package_info.pkg_mgr }}" args: - pkg: "{{item}}" + pkg: "{{item.name}}" + force: "{{item.force|default(omit)}}" state: present with_items: "{{ docker_package_info.pkgs }}" when: (ansible_os_family != "CoreOS") and (docker_package_info.pkgs|length > 0) diff --git a/roles/docker/vars/centos-6.yml b/roles/docker/vars/centos-6.yml index 10f2aa9be38e33a7e6db2cdf92e235cf28eb8434..48406378877ab8cc377229ea8eb94504307655e3 100644 --- a/roles/docker/vars/centos-6.yml +++ b/roles/docker/vars/centos-6.yml @@ -5,7 +5,7 @@ docker_kernel_min_version: '2.6.32-431' docker_package_info: pkg_mgr: yum pkgs: - - docker-io + - name: docker-io docker_repo_key_info: pkg_key: '' diff --git a/roles/docker/vars/debian.yml b/roles/docker/vars/debian.yml index 87bd8834cf4d7e621c4723f30b480ac55b048d64..ce8b52263ab7a69684ab815cd6159a2ac397c81c 100644 --- a/roles/docker/vars/debian.yml +++ b/roles/docker/vars/debian.yml @@ -9,7 +9,8 @@ docker_versioned_pkg: docker_package_info: pkg_mgr: apt pkgs: - - "{{ docker_versioned_pkg[docker_version] }}" + - name: "{{ docker_versioned_pkg[docker_version] }}" + force: yes docker_repo_key_info: pkg_key: apt_key diff --git a/roles/docker/vars/fedora-20.yml b/roles/docker/vars/fedora-20.yml index 520469279d6cad1fe63b0c33305ab88c41b23a3e..c74cd9f2829e7ff7fee8f3305fba6f28b6b7cdd1 100644 --- a/roles/docker/vars/fedora-20.yml +++ b/roles/docker/vars/fedora-20.yml @@ -5,7 +5,7 @@ docker_kernel_min_version: '0' docker_package_info: pkg_mgr: yum pkgs: - - docker-io + - name: docker-io docker_repo_key_info: pkg_key: '' diff --git a/roles/docker/vars/fedora.yml b/roles/docker/vars/fedora.yml index a27492234eff3366828e917ae22047a311fec247..d1693fab73421ba1af0557aee0fbd8e443844c2b 100644 --- a/roles/docker/vars/fedora.yml +++ b/roles/docker/vars/fedora.yml @@ -8,7 +8,7 @@ docker_versioned_pkg: docker_package_info: pkg_mgr: dnf pkgs: - - "{{ docker_versioned_pkg[docker_version] }}" + - name: "{{ docker_versioned_pkg[docker_version] }}" docker_repo_key_info: pkg_key: '' diff --git a/roles/docker/vars/redhat.yml b/roles/docker/vars/redhat.yml index 9814089e0717ac4e74c679a49cfc63163a5e23d8..5dde8dee1b1ca7a881bda748029d50055a831774 100644 --- a/roles/docker/vars/redhat.yml +++ b/roles/docker/vars/redhat.yml @@ -3,7 +3,7 @@ docker_kernel_min_version: '0' docker_package_info: pkg_mgr: yum pkgs: - - docker-engine + - name: docker-engine docker_repo_key_info: pkg_key: '' diff --git a/roles/docker/vars/ubuntu-16.04.yml b/roles/docker/vars/ubuntu-16.04.yml index c019c7696fda46b51993400203f4c716e1884ce2..e5b84702d32f2ba1cd10d7194e915fb06c6f761d 100644 --- a/roles/docker/vars/ubuntu-16.04.yml +++ b/roles/docker/vars/ubuntu-16.04.yml @@ -10,7 +10,8 @@ docker_versioned_pkg: docker_package_info: pkg_mgr: apt pkgs: - - "{{ docker_versioned_pkg[docker_version] }}" + - name: "{{ docker_versioned_pkg[docker_version] }}" + force: yes docker_repo_key_info: pkg_key: apt_key diff --git a/roles/docker/vars/ubuntu.yml b/roles/docker/vars/ubuntu.yml index 0f8ca9d9623192ab63af0e2e83df011431918418..18da1b85eb416ce16b93163ad50798a00b6e692b 100644 --- a/roles/docker/vars/ubuntu.yml +++ b/roles/docker/vars/ubuntu.yml @@ -10,7 +10,8 @@ docker_versioned_pkg: docker_package_info: pkg_mgr: apt pkgs: - - "{{ docker_versioned_pkg[docker_version] }}" + - name: "{{ docker_versioned_pkg[docker_version] }}" + force: yes docker_repo_key_info: pkg_key: apt_key