default rbd_client_admin_socket_path to /var/run/ceph

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

diff --git a/group_vars/all.sample b/group_vars/all.sample
index 18ad1165131e8a8b2a1f06e419fa22f670a4cc0b..604360ba919b76def913832b020dc9a1dc1dbc6f 100644 (file)
--- a/group_vars/all.sample
+++ b/group_vars/all.sample
@@ -219,7 +219,7 @@ dummy:
 
 #rbd_client_log_path: /var/log/rbd-clients/
 #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 02d8ccb2a49ceedf0c393111f9f54a12d3454577..5bc59d12a424c419a570415056fd58516f4d8fd5 100644 (file)
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -211,7 +211,7 @@ rbd_client_directory_mode: null
 
 rbd_client_log_path: /var/log/rbd-clients/
 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