From: Guillaume Abrioux Date: Fri, 30 Mar 2018 10:38:41 +0000 (+0200) Subject: move selinux check to `ceph-defaults` X-Git-Tag: v3.1.0beta5~14 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cf27c5e9417b5405c94ca2044b859504b5d189f5;p=ceph-ansible.git 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 --- diff --git a/roles/ceph-defaults/tasks/facts.yml b/roles/ceph-defaults/tasks/facts.yml index 0f48c9ebd..9c1e75fc5 100644 --- 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 9eeb376a2..13ff5270d 100644 --- 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 index 1c22d5828..000000000 --- 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