default rbd_client_log_path to /var/log/ceph

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 79a6e0522862fd116d1d0c5c08b339995759a8c9)

diff --git a/group_vars/all.sample b/group_vars/all.sample
index aa62b98c895f3566c9eb8384b6624bcc3899f84a..e215a71916752849c265b367bffc073f6f147d30 100644 (file)
--- a/group_vars/all.sample
+++ b/group_vars/all.sample
@@ -216,7 +216,7 @@ dummy:
 #rbd_client_directory_group: null
 #rbd_client_directory_mode: null
 
-#rbd_client_log_path: /var/log/rbd-clients/
+#rbd_client_log_path: /var/log/ceph
 #rbd_client_log_file: "{{ rbd_client_log_path }}/qemu-guest-$pid.log" # must be writable by QEMU and allowed by SELinux or AppArmor
 #rbd_client_admin_socket_path: /var/run/ceph/rbd-clients # must be writable by QEMU and allowed by SELinux or AppArmor
 #rbd_default_features: 3

diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index 689628d6f552564f9201d3fc07db9b184d1b93c5..eb83e2bcb7223a847c29860df2c563986f9120d7 100644 (file)
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -208,7 +208,7 @@ rbd_client_directory_owner: null
 rbd_client_directory_group: null
 rbd_client_directory_mode: null
 
-rbd_client_log_path: /var/log/rbd-clients/
+rbd_client_log_path: /var/log/ceph
 rbd_client_log_file: "{{ rbd_client_log_path }}/qemu-guest-$pid.log" # must be writable by QEMU and allowed by SELinux or AppArmor
 rbd_client_admin_socket_path: /var/run/ceph/rbd-clients # must be writable by QEMU and allowed by SELinux or AppArmor
 rbd_default_features: 3