ceph-ansible/roles/ceph-osd
Dimitri Savineau 54128db5cd ceph-osd: Fix merge conflict from mergify
The PR #3916 was merged automatically by mergify even if there was a
confict in the ceph-osd-run.sh.j2 template.
This commit resolves the conflict.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
2019-04-24 12:41:23 -04:00
..
defaults ceph-osd: Increase cpu limit to 4 2019-04-24 16:02:28 +00:00
meta ceph-osd: Add support for openSUSE Leap distributions 2017-11-14 10:51:23 +00:00
tasks remove all NBSPs char in stable-3.2 branch 2019-04-10 13:27:48 +02:00
templates ceph-osd: Fix merge conflict from mergify 2019-04-24 12:41:23 -04:00
vars osd: backward compatibility with old disk_list.sh location 2019-03-18 21:56:53 +00:00
LICENSE Add READMEs for each roles 2015-07-25 10:51:53 +02:00
README.md Cleanup readme files in roles directories 2017-10-17 11:22:06 +02:00

README.md

Ansible role: ceph-osd

Documentation is available at http://docs.ceph.com/ceph-ansible/.