Fix followup on refact code (1469)

In addition to 7bb04a5, these lines are no longer needed and can even
cause playbook failures.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

diff --git a/roles/ceph-docker-common/tasks/main.yml b/roles/ceph-docker-common/tasks/main.yml
index d27223fb9e377ec566876f04ac9cd7cc92e40466..fc86e14fcb8e19b7774d78ab676c8d2e5dc898fd 100644 (file)
--- a/roles/ceph-docker-common/tasks/main.yml
+++ b/roles/ceph-docker-common/tasks/main.yml
@@ -95,3 +95,4 @@
       (inventory_hostname in groups.get('rgws', []))
 
 - include: selinux.yml
+  when: ansible_os_family == 'RedHat'

diff --git a/roles/ceph-nfs/tasks/docker/main.yml b/roles/ceph-nfs/tasks/docker/main.yml
index 9a731c46b2c6a4a9eff1c36bdf127508e630be2b..30da2f32411e4d32e8645dc8c3d2070646f1946d 100644 (file)
--- a/roles/ceph-nfs/tasks/docker/main.yml
+++ b/roles/ceph-nfs/tasks/docker/main.yml
@@ -2,8 +2,5 @@
 # Copy Ceph configs to host
 - include: copy_configs.yml
 
-- include: selinux.yml
-  when: ansible_os_family == 'RedHat'
-
 - include: start_docker_nfs.yml
 

diff --git a/roles/ceph-osd/tasks/docker/main.yml b/roles/ceph-osd/tasks/docker/main.yml
index d9bff3ee2202345526998e9384fb7636f3dcf8d0..db0fad568efdb9c71f43fd7c1fa82dc96f4977e3 100644 (file)
--- a/roles/ceph-osd/tasks/docker/main.yml
+++ b/roles/ceph-osd/tasks/docker/main.yml
@@ -1,5 +1,2 @@
 ---
-- include: fetch_configs.yml
-  when: not containerized_deployment_with_kv
-
 - include: start_docker_osd.yml

diff --git a/roles/ceph-rbd-mirror/tasks/docker/main.yml b/roles/ceph-rbd-mirror/tasks/docker/main.yml
index 84ebe12e08c092a9628bbe9c3816c3eeef850f20..04ef970173b9b98610b20ff440cd5e1cf1574a31 100644 (file)
--- a/roles/ceph-rbd-mirror/tasks/docker/main.yml
+++ b/roles/ceph-rbd-mirror/tasks/docker/main.yml
@@ -1,4 +1,2 @@
 ---
-- include: fetch_configs.yml
-
 - include: start_docker_rbd_mirror.yml

diff --git a/roles/ceph-restapi/tasks/docker/main.yml b/roles/ceph-restapi/tasks/docker/main.yml
index 900cd8d2ad5045f836f96cc86bdd5cbfd1a1656d..9a09e14a8be99d99f32ccc769306c82f832ddd34 100644 (file)
--- a/roles/ceph-restapi/tasks/docker/main.yml
+++ b/roles/ceph-restapi/tasks/docker/main.yml
@@ -1,3 +1,2 @@
 ---
-- include: fetch_configs.yml
 - include: start_docker_restapi.yml

diff --git a/roles/ceph-rgw/tasks/docker/main.yml b/roles/ceph-rgw/tasks/docker/main.yml
index 8a599aef973c115150abd0fa0a8360ca430e3f05..71e2c652c899dcf454d278b02b8c1092327e0ac9 100644 (file)
--- a/roles/ceph-rgw/tasks/docker/main.yml
+++ b/roles/ceph-rgw/tasks/docker/main.yml
@@ -1,6 +1,4 @@
 ---
-- include: fetch_configs.yml
-
 - include: start_docker_rgw.yml
 
 - include: copy_configs.yml