Remove the prepare-docker test role 29/89229/1
authorMichal Zegan <m.zegan@samsung.com>
Tue, 4 Jun 2019 11:07:58 +0000 (13:07 +0200)
committerMichal Zegan <m.zegan@samsung.com>
Tue, 4 Jun 2019 11:08:43 +0000 (13:08 +0200)
This removed the unused prepare-docker role.
The dind version is now the only one used.

Change-Id: Ic7c1c46ae06d931de7abac1f225675c8d6bf7dbd
Issue-ID: OOM-1902
Issue-ID: OOM-1862
Signed-off-by: Michal Zegan <m.zegan@samsung.com>
ansible/test/roles/prepare-docker/tasks/docker-packages.yml [deleted file]
ansible/test/roles/prepare-docker/tasks/docker-socket-override.yml [deleted file]
ansible/test/roles/prepare-docker/tasks/enable-repos.yml [deleted file]
ansible/test/roles/prepare-docker/tasks/main.yml [deleted file]
ansible/test/roles/prepare-docker/tasks/prepare-docker-repos.yml [deleted file]
ansible/test/roles/prepare-docker/vars/main.yml [deleted file]

diff --git a/ansible/test/roles/prepare-docker/tasks/docker-packages.yml b/ansible/test/roles/prepare-docker/tasks/docker-packages.yml
deleted file mode 100644 (file)
index 8f55c5c..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
----
-
-- name: Download docker related packages
-  command: yumdownloader --destdir="{{ rpm_dir }}" "{{ docker_ce_rpm }}"
-  args:
-    creates: "{{ rpm_dir }}/{{ docker_ce_rpm }}"
-
-- name: Install docker related packages
-  yum:
-    name: "{{ rpm_dir + '/' + docker_ce_rpm + '.rpm'}}"
diff --git a/ansible/test/roles/prepare-docker/tasks/docker-socket-override.yml b/ansible/test/roles/prepare-docker/tasks/docker-socket-override.yml
deleted file mode 100644 (file)
index 0cabadf..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- name: Create docker.socket systemd dir for override
-  file:
-    path: /etc/systemd/system/docker.socket.d
-    state: directory
-
-- name: Fake dockerd dependent docker.socket service not to actually listen the docker socket as dockerd is not used in container only docker client
-  copy:
-    content: |
-      [Socket]
-      ListenStream=
-      ListenStream=/tmp/fake
-    dest: /etc/systemd/system/docker.socket.d/override.conf
diff --git a/ansible/test/roles/prepare-docker/tasks/enable-repos.yml b/ansible/test/roles/prepare-docker/tasks/enable-repos.yml
deleted file mode 100644 (file)
index 204bf03..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- name: Enable docker repos back for Molecule testing purposes
-  copy:
-    remote_src: yes
-    src: "{{ item }}"
-    dest: "{{ (item | splitext)[0] }}"
-  loop: "{{ docker_needed_repos }}"
-
-- name: Disable offline repo for molecule testing purposes
-  lineinfile:
-    path: "{{ offline_repo_file }}"
-    regexp: 'enabled = 1'
-    line: 'enabled = 0'
diff --git a/ansible/test/roles/prepare-docker/tasks/main.yml b/ansible/test/roles/prepare-docker/tasks/main.yml
deleted file mode 100644 (file)
index e7d8706..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
----
-- name: Check repositories
-  stat:
-    path: "{{ item }}"
-  loop: "{{ docker_needed_repos + [offline_repo_file] }}"
-  register: repos
-
-- name: Set fact for offline repos created
-  set_fact:
-    offline_repo_created: "{{ (repos.results | map(attribute='stat.exists') | list) is all }}"
-
-- debug:
-    var: offline_repo_created
-
-- name: Enable repos back (if package-repository role already setup offline onap repo) for molecule testing purposes to install docker
-  include_tasks: enable-repos.yml
-  when: offline_repo_created
-
-- name: Prepare docker repos normally
-  include_tasks: prepare-docker-repos.yml
-  when: not offline_repo_created
diff --git a/ansible/test/roles/prepare-docker/tasks/prepare-docker-repos.yml b/ansible/test/roles/prepare-docker/tasks/prepare-docker-repos.yml
deleted file mode 100644 (file)
index 01ea72c..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
----
-- name: Install Docker-CE repo
-  yum_repository:
-    name: docker-ce
-    description: Docker-ce YUM repo
-    baseurl: https://download.docker.com/linux/centos/7/x86_64/stable/
-    gpgcheck: true
-    gpgkey: https://download.docker.com/linux/centos/gpg
-
-- name: Create rpm dir
-  file:
-    path: "{{ rpm_dir }}"
-    state: directory
-
-- name: Handle docker-ce packages
-  import_tasks: docker-packages.yml
-
-- name: Fake dockerd on container
-  import_tasks: docker-socket-override.yml
-  when: ansible_env.container == 'docker'
diff --git a/ansible/test/roles/prepare-docker/vars/main.yml b/ansible/test/roles/prepare-docker/vars/main.yml
deleted file mode 100644 (file)
index bcd7f36..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
----
-docker_needed_repos:
-  - /etc/yum.repos.d/CentOS-Base.repo.disabled
-  - /etc/yum.repos.d/docker-ce.repo.disabled
-offline_repo_file: /etc/yum.repos.d/onap.repo
-rpm_dir: /root/rpm
-docker_ce_rpm: docker-ce-18.09.5-3.el7.x86_64