From: Zack Cerza <zack@redhat.com>
Date: Thu, 10 May 2018 22:55:05 +0000 (-0600)
Subject: ceph-collectd: Set SEL context on bluestore
X-Git-Tag: v2.0~29^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F182%2Fhead;p=cephmetrics.git

ceph-collectd: Set SEL context on bluestore

... as well as filestore.

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/ansible/roles/ceph-collectd/tasks/selinux.yml b/ansible/roles/ceph-collectd/tasks/selinux.yml
index 80885e3..37db2f1 100644
--- a/ansible/roles/ceph-collectd/tasks/selinux.yml
+++ b/ansible/roles/ceph-collectd/tasks/selinux.yml
@@ -6,10 +6,11 @@
     persistent: yes
 
 - name: Restore SELinux context of OSD journals
-  shell: "restorecon -R -v /var/lib/ceph/osd/*/journal"
+  shell: "restorecon -R -v /var/lib/ceph/osd/*/{journal,block.wal}"
   when: "'osds' in group_names"
   register: restorecon
-  changed_when: restorecon.stdout|length != 0 or restorecon.stderr|length != 0
+  changed_when: restorecon.stdout|length != 0
+  failed_when: restorecon.rc != 0 and restorecon.rc != 255
 
 - include: selinux_module.yml
   when: