From: Sébastien Han <seb@redhat.com>
Date: Wed, 17 Jun 2015 11:44:05 +0000 (+0200)
Subject: Create client socket path
X-Git-Tag: v1.0.0~203^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3fe1fcc4104ebcba28f60105a7600954d16efaa9;p=ceph-ansible.git

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 6cf6f2535..3cc97b9df 100644
--- 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
 rbd_client_log_file: /var/log/rbd-clients/qemu-guest-$pid.log # must be writable by QEMU and allowed by SELinux or AppArmor
 rbd_client_log_path: /var/log/rbd-clients/
-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
+rbd_client_admin_socket_path: /var/run/ceph/rbd-clients/ # must be writable by QEMU and allowed by SELinux or AppArmor
 
 ## Monitor options
 #
diff --git a/roles/ceph-common/tasks/main.yml b/roles/ceph-common/tasks/main.yml
index 4d32f93ec..8435dae6a 100644
--- 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 3743a4687..7b6eeed06 100644
--- 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]