move selinux check to `ceph-defaults`

This check is alone in `ceph-docker-common` since a previous code
refactor.
Moving this check in `ceph-defaults` allows us to run `ceph-clients`
without having to run `ceph-docker-common` even in non-containerized
deployment.

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

diff --git a/roles/ceph-defaults/tasks/facts.yml b/roles/ceph-defaults/tasks/facts.yml
index 0f48c9ebd4fd2ae9d44d2677b35aa2ee28021014..9c1e75fc52f06f6110ae98680dc3977e95bf1b08 100644 (file)
--- a/roles/ceph-defaults/tasks/facts.yml
+++ b/roles/ceph-defaults/tasks/facts.yml
@@ -192,3 +192,11 @@
   when:
     - containerized_deployment
     - ceph_docker_image_tag | search("centos") or ceph_docker_image | search("rhceph") or ceph_docker_image_tag | search("fedora")
+
+- name: check if selinux is enabled
+  command: getenforce
+  register: sestatus
+  changed_when: false
+  check_mode: no
+  when:
+    - ansible_os_family == 'RedHat'

diff --git a/roles/ceph-docker-common/tasks/main.yml b/roles/ceph-docker-common/tasks/main.yml
index 9eeb376a2f74a39e2ad5e391eb5831811261f14f..13ff5270d1e9fad03b7e06a66500327d5644019c 100644 (file)
--- a/roles/ceph-docker-common/tasks/main.yml
+++ b/roles/ceph-docker-common/tasks/main.yml
@@ -98,8 +98,3 @@
 # # because it creates the directories needed by the latter.
 - name: include dirs_permissions.yml
   include: dirs_permissions.yml
-
-- name: include selinux.yml
-  include: selinux.yml
-  when:
-    - ansible_os_family == 'RedHat'

diff --git a/roles/ceph-docker-common/tasks/selinux.yml b/roles/ceph-docker-common/tasks/selinux.yml
deleted file mode 100644 (file)
index 1c22d58..0000000
--- a/roles/ceph-docker-common/tasks/selinux.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- name: check if selinux is enabled
-  command: getenforce
-  register: sestatus
-  changed_when: false
-  check_mode: no