From d8971d74e4cbe2a53e65251815c324f74eb5e5cd Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Tue, 12 Dec 2017 14:55:02 +0100 Subject: [PATCH] docker: add missing condition for selinux tasks MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit on `client` and `mds` roles, it tries to set selinux even on non rhel based distributions.` Signed-off-by: Guillaume Abrioux (cherry picked from commit 26afe46e1333df8bec554feb3f57ab8c60390655) Signed-off-by: Sébastien Han --- roles/ceph-client/tasks/pre_requisite.yml | 1 + roles/ceph-mds/tasks/containerized.yml | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/roles/ceph-client/tasks/pre_requisite.yml b/roles/ceph-client/tasks/pre_requisite.yml index cacf12cea..ec90bf5d9 100644 --- a/roles/ceph-client/tasks/pre_requisite.yml +++ b/roles/ceph-client/tasks/pre_requisite.yml @@ -8,6 +8,7 @@ changed_when: false when: - containerized_deployment + - ansible_os_family == 'RedHat' - sestatus is defined - sestatus.stdout != 'Disabled' diff --git a/roles/ceph-mds/tasks/containerized.yml b/roles/ceph-mds/tasks/containerized.yml index ead7d18fd..c2a00c326 100644 --- a/roles/ceph-mds/tasks/containerized.yml +++ b/roles/ceph-mds/tasks/containerized.yml @@ -37,7 +37,9 @@ - "{{ ceph_conf_key_directory }}" - /var/lib/ceph changed_when: false - when: sestatus.stdout != 'Disabled' + when: + - ansible_os_family == 'RedHat' + - sestatus.stdout != 'Disabled' - name: generate systemd unit file become: true -- 2.47.3