diff options
author | Bartek Grzybowski <b.grzybowski@partner.samsung.com> | 2019-05-16 13:36:00 +0200 |
---|---|---|
committer | Bartek Grzybowski <b.grzybowski@partner.samsung.com> | 2019-05-17 12:42:38 +0000 |
commit | b5f99a2fff91001f14eb870369dc0a584e9c81c0 (patch) | |
tree | 13b7fb56e60af800be30c132fabf169b777d1d73 /ansible/test/roles/prepare-docker/tasks | |
parent | a82fa0d6493888a8e5b29f2c87d6675fddf0c1a9 (diff) |
Upgrade docker version to 18.09.5
This patch upgrades docker version for
Molecule tests to 18.09.5; it also sanitizes
tasks in 'docker' role to supplement this
change: https://gerrit.onap.org/r/c/87761/
Change-Id: I14beffafb129b24e7c15f8da45f1a25e27ccae9c
Issue-ID: OOM-1852
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
Diffstat (limited to 'ansible/test/roles/prepare-docker/tasks')
3 files changed, 3 insertions, 22 deletions
diff --git a/ansible/test/roles/prepare-docker/tasks/docker-packages.yml b/ansible/test/roles/prepare-docker/tasks/docker-packages.yml index 1239e1a0..8f55c5ce 100644 --- a/ansible/test/roles/prepare-docker/tasks/docker-packages.yml +++ b/ansible/test/roles/prepare-docker/tasks/docker-packages.yml @@ -1,10 +1,10 @@ --- - name: Download docker related packages - command: yumdownloader --destdir="{{ rpm_dir }}" "{{ docker_ce_rpm }}" "{{ docker_ce_selinux_rpm }}" + command: yumdownloader --destdir="{{ rpm_dir }}" "{{ docker_ce_rpm }}" args: - creates: "{{ rpm_dir }}/{{ docker_ce_selinux_rpm }}" + creates: "{{ rpm_dir }}/{{ docker_ce_rpm }}" - name: Install docker related packages yum: - name: "{{ rpm_dir + '/' + docker_ce_rpm + '.rpm'}},{{ rpm_dir + '/' + docker_ce_selinux_rpm + '.rpm' }}" + name: "{{ rpm_dir + '/' + docker_ce_rpm + '.rpm'}}" diff --git a/ansible/test/roles/prepare-docker/tasks/prepare-docker-repos.yml b/ansible/test/roles/prepare-docker/tasks/prepare-docker-repos.yml index f35ffeee..01ea72c3 100644 --- a/ansible/test/roles/prepare-docker/tasks/prepare-docker-repos.yml +++ b/ansible/test/roles/prepare-docker/tasks/prepare-docker-repos.yml @@ -12,9 +12,6 @@ path: "{{ rpm_dir }}" state: directory -- name: Handle python2-docker dependency needed by Ansible's docker_* modules - import_tasks: python2-docker.yml - - name: Handle docker-ce packages import_tasks: docker-packages.yml diff --git a/ansible/test/roles/prepare-docker/tasks/python2-docker.yml b/ansible/test/roles/prepare-docker/tasks/python2-docker.yml deleted file mode 100644 index f091cf85..00000000 --- a/ansible/test/roles/prepare-docker/tasks/python2-docker.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -- name: Remove docker-python that is conflicting with python2-docker - package: - name: docker-python - state: absent - -- name: Download python2-docker rpm for Ansible (docker_container module dep) - get_url: - url: "{{ python2_docker_rpm_url }}" - dest: "{{ rpm_dir }}" - register: rpm - -- name: Install docker python module - package: - name: "{{ rpm_dir + '/' + python2_docker_rpm }}" - state: present |