From b649c4229ad9ea64579ae91e73b0ab400f1c5e1d Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Fri, 22 Apr 2016 10:59:00 -0500 Subject: [PATCH] default rbd_client_admin_socket_path to /var/run/ceph Signed-off-by: Andrew Schoen --- group_vars/all.sample | 2 +- roles/ceph-common/defaults/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/group_vars/all.sample b/group_vars/all.sample index 18ad11651..604360ba9 100644 --- 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 02d8ccb2a..5bc59d12a 100644 --- 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