ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #285 from ceph/fix-client-socket-path 

Create client socket path
pull/286/head
Leseb 2015-06-17 13:49:57 +02:00
parent 3b8796e532 3fe1fcc410
commit 900eefd5e3
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/ceph-common/defaults/main.yml
View File

@ -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_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_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_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 ## Monitor options
# #

8
roles/ceph-common/tasks/main.yml
View File

@ -50,3 +50,11 @@
- restart ceph osds on ubuntu - restart ceph osds on ubuntu
- restart ceph mdss - restart ceph mdss
- restart ceph rgws - restart ceph rgws
- name: create rbd client directory
file: >
path={{ rbd_client_admin_socket_path }}
state=directory
owner=root
group=root
mode=0644

2
roles/ceph-common/templates/ceph.conf.j2
View File

@ -65,7 +65,7 @@
rbd cache = {{ rbd_cache }} rbd cache = {{ rbd_cache }}
rbd cache writethrough until flush = true rbd cache writethrough until flush = true
rbd concurrent management ops = {{ rbd_concurrent_management_ops }} 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 log file = {{ rbd_client_log_file }} # must be writable by QEMU and allowed by SELinux or AppArmor
[mon] [mon]