default rbd_client_admin_socket_path to /var/run/ceph

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

diff --git a/group_vars/all.sample b/group_vars/all.sample
index e215a71916752849c265b367bffc073f6f147d30..1f462a6c7a0a571cfe71d1885201aeabfd47f7b7 100644 (file)
--- a/group_vars/all.sample
+++ b/group_vars/all.sample
@@ -218,7 +218,7 @@ dummy:
 
 #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_client_admin_socket_path: /var/run/ceph # must be writable by QEMU and allowed by SELinux or AppArmor
 #rbd_default_features: 3
 #rbd_default_map_options: rw
 #rbd_default_format: 2

diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index eb83e2bcb7223a847c29860df2c563986f9120d7..b8599cb4d7bf3077a72c3901e410164d70533ec8 100644 (file)
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -210,7 +210,7 @@ rbd_client_directory_mode: null
 
 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_client_admin_socket_path: /var/run/ceph # must be writable by QEMU and allowed by SELinux or AppArmor
 rbd_default_features: 3
 rbd_default_map_options: rw
 rbd_default_format: 2