Create client socket path

This will avoid some error messages from the client when running a
command with the CLI or other.

Signed-off-by: Sébastien Han <seb@redhat.com>

diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index 6cf6f2535966318469bded7185e5c7456c457b71..3cc97b9df41632477192956e2d44299807943c77 100644 (file)
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -75,7 +75,7 @@ rbd_concurrent_management_ops: 20
 rbd_client_directories: false # this will create rbd_client_log_path and rbd_client_admin_socket_path directories with proper permissions, this WON'T work if libvirt and kvm are installed\r
 rbd_client_log_file: /var/log/rbd-clients/qemu-guest-$pid.log # must be writable by QEMU and allowed by SELinux or AppArmor\r
 rbd_client_log_path: /var/log/rbd-clients/\r
-rbd_client_admin_socket_path: /var/run/ceph/rbd-clients/$cluster-$type.$id.$pid.$cctid.asok # must be writable by QEMU and allowed by SELinux or AppArmor\r
+rbd_client_admin_socket_path: /var/run/ceph/rbd-clients/ # must be writable by QEMU and allowed by SELinux or AppArmor\r
 \r
 ## Monitor options\r
 #\r

diff --git a/roles/ceph-common/tasks/main.yml b/roles/ceph-common/tasks/main.yml
index 4d32f93ece2d10ec7e2192fdecb64ccdba64c38a..8435dae6ad116b6fc59bbe00b3cab4049e865419 100644 (file)
--- a/roles/ceph-common/tasks/main.yml
+++ b/roles/ceph-common/tasks/main.yml
@@ -50,3 +50,11 @@
     - restart ceph osds on ubuntu
     - restart ceph mdss
     - restart ceph rgws
+
+- name: create rbd client directory
+  file: >
+    path={{ rbd_client_admin_socket_path }}
+    state=directory
+    owner=root
+    group=root
+    mode=0644

diff --git a/roles/ceph-common/templates/ceph.conf.j2 b/roles/ceph-common/templates/ceph.conf.j2
index 3743a4687ae9b26933a9c607a1effec645518518..7b6eeed06ec2c2148bf70ff094ad6853141fdb8d 100644 (file)
--- a/roles/ceph-common/templates/ceph.conf.j2
+++ b/roles/ceph-common/templates/ceph.conf.j2
@@ -65,7 +65,7 @@
   rbd cache = {{ rbd_cache }}
   rbd cache writethrough until flush = true
   rbd concurrent management ops = {{ rbd_concurrent_management_ops }}
-  admin socket = {{ rbd_client_admin_socket_path }} # must be writable by QEMU and allowed by SELinux or AppArmor
+  admin socket = {{ rbd_client_admin_socket_path }}/$cluster-$type.$id.$pid.$cctid.asok # must be writable by QEMU and allowed by SELinux or AppArmor
   log file = {{ rbd_client_log_file }} # must be writable by QEMU and allowed by SELinux or AppArmor
 
 [mon]