]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
docker: add missing condition for selinux tasks
authorGuillaume Abrioux <gabrioux@redhat.com>
Tue, 12 Dec 2017 13:55:02 +0000 (14:55 +0100)
committerSébastien Han <seb@redhat.com>
Tue, 19 Dec 2017 12:38:22 +0000 (13:38 +0100)
on `client` and `mds` roles, it tries to set selinux even on non rhel
based distributions.`

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 26afe46e1333df8bec554feb3f57ab8c60390655)
Signed-off-by: Sébastien Han <seb@redhat.com>
roles/ceph-client/tasks/pre_requisite.yml
roles/ceph-mds/tasks/containerized.yml

index cacf12ceae8660ba31d5d67d21c7869f2b5f21de..ec90bf5d974535b91d44418f4ab390a497901fd0 100644 (file)
@@ -8,6 +8,7 @@
   changed_when: false
   when:
     - containerized_deployment
+    - ansible_os_family == 'RedHat'
     - sestatus is defined
     - sestatus.stdout != 'Disabled'
 
index ead7d18fdbe2190eafbfbdde0236de7c49dc87e1..c2a00c326566b44ddeb13544a214da04da62f357 100644 (file)
@@ -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