Correct /var/log/pcp permissions for collectors

Some hosts were getting a /var/log/pcp/pmmgr that was owned by root:root
for some reason.

Fixes: http://tracker.ceph.com/issues/15575
Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/roles/pcp/tasks/collector.yml b/roles/pcp/tasks/collector.yml
index f5e9704355546e7c7586c345f8d7bca4def3c96e..99605fbca688348bc371581d128153cf71ca2544 100644 (file)
--- a/roles/pcp/tasks/collector.yml
+++ b/roles/pcp/tasks/collector.yml
@@ -23,6 +23,8 @@
   when:
     ansible_pkg_mgr == "dnf"
 
+- include: permissons.yml
+
 - name: Restart pcp
   service:
     name: "{{ pmcd_service }}"

diff --git a/roles/pcp/tasks/manager.yml b/roles/pcp/tasks/manager.yml
index 74060148e7ae60c45c1c52f043bfc661679ea307..dd66e2ca43ec8b80230bf493ebc8b50b9ec196c2 100644 (file)
--- a/roles/pcp/tasks/manager.yml
+++ b/roles/pcp/tasks/manager.yml
@@ -72,12 +72,7 @@
     mode: 0644
   register: target_discovery
 
-- name: Ensure /var/log/pcp is owned by pcp
-  file:
-    path: /var/log/pcp
-    owner: "{{ pcp_user }}"
-    group: "{{ pcp_user }}"
-    recurse: yes
+- include: permissons.yml
 
 # This greatly speeds up polling for hosts
 - name: Set PMCD_CONNECT_TIMEOUT in pmmgr.options

diff --git a/roles/pcp/tasks/permissons.yml b/roles/pcp/tasks/permissons.yml
new file mode 100644 (file)
index 0000000..742d6e6
--- /dev/null
+++ b/roles/pcp/tasks/permissons.yml
@@ -0,0 +1,7 @@
+---
+- name: Ensure /var/log/pcp is owned by pcp
+  file:
+    path: /var/log/pcp
+    owner: "{{ pcp_user }}"
+    group: "{{ pcp_user }}"
+    recurse: yes