From ebc195487c2a2c8764594403b388c3d4624443fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Han?= <seb@redhat.com>
Date: Tue, 13 Feb 2018 09:37:14 +0100
Subject: [PATCH] default: remove duplicate code
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is already defined in ceph-defaults.

Signed-off-by: Sébastien Han <seb@redhat.com>
---
 .../tasks/check_socket_container.yml          | 63 -------------------
 roles/ceph-docker-common/tasks/main.yml       |  3 -
 2 files changed, 66 deletions(-)
 delete mode 100644 roles/ceph-docker-common/tasks/check_socket_container.yml

diff --git a/roles/ceph-docker-common/tasks/check_socket_container.yml b/roles/ceph-docker-common/tasks/check_socket_container.yml
deleted file mode 100644
index 7c945ab46..000000000
--- a/roles/ceph-docker-common/tasks/check_socket_container.yml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-- name: check for a mon container
-  command: "docker ps -q --filter='name=ceph-mon-{{ ansible_hostname }}'"
-  register: ceph_mon_container_stat
-  changed_when: false
-  failed_when: false
-  check_mode: no
-  when:
-    - inventory_hostname in groups.get(mon_group_name, [])
-
-- name: check for an osd container
-  command: "docker ps -q --filter='name=ceph-osd-{{ ansible_hostname }}'"
-  register: ceph_osd_container_stat
-  changed_when: false
-  failed_when: false
-  check_mode: no
-  when:
-    - inventory_hostname in groups.get(osd_group_name, [])
-
-- name: check for a mds container
-  command: "docker ps -q --filter='name=ceph-mds-{{ ansible_hostname }}'"
-  register: ceph_mds_container_stat
-  changed_when: false
-  failed_when: false
-  check_mode: no
-  when:
-    - inventory_hostname in groups.get(mds_group_name, [])
-
-- name: check for a rgw container
-  command: "docker ps -q --filter='name=ceph-rgw-{{ ansible_hostname }}'"
-  register: ceph_rgw_container_stat
-  changed_when: false
-  failed_when: false
-  check_mode: no
-  when:
-    - inventory_hostname in groups.get(rgw_group_name, [])
-
-- name: check for a mgr container
-  command: "docker ps -q --filter='name=ceph-mgr-{{ ansible_hostname }}'"
-  register: ceph_mgr_container_stat
-  changed_when: false
-  failed_when: false
-  check_mode: no
-  when:
-    - inventory_hostname in groups.get(mgr_group_name, [])
-
-- name: check for a rbd mirror container
-  command: "docker ps -q --filter='name=ceph-rbd-mirror-{{ ansible_hostname }}'"
-  register: ceph_rbd_mirror_container_stat
-  changed_when: false
-  failed_when: false
-  check_mode: no
-  when:
-    - inventory_hostname in groups.get(rbdmirror_group_name, [])
-
-- name: check for a nfs container
-  command: "docker ps -q --filter='name=ceph-nfs-{{ ansible_hostname }}'"
-  register: ceph_nfs_container_stat
-  changed_when: false
-  failed_when: false
-  check_mode: no
-  when:
-    - inventory_hostname in groups.get(nfs_group_name, [])
diff --git a/roles/ceph-docker-common/tasks/main.yml b/roles/ceph-docker-common/tasks/main.yml
index 5551a7a7b..434c2d324 100644
--- a/roles/ceph-docker-common/tasks/main.yml
+++ b/roles/ceph-docker-common/tasks/main.yml
@@ -88,9 +88,6 @@
     - ansible_os_family == 'Debian'
     - ntp_service_enabled
 
-- name: include check_socket_container.yml
-  include: check_socket_container.yml
-  
 - name: include fetch_image.yml
   include: fetch_image.yml
   tags: