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

Merge branch 'fix_template_path' of https://github.com/Sysnove/ceph-ansible into Sysnove-fix_template_path 

Conflicts:
	roles/ceph-common/tasks/Debian.yml
	roles/ceph-common/tasks/RedHat.yml
pull/103/head
Sébastien Han 2014-08-14 14:30:33 +02:00
parent 17469b4b5e 16711d63df
commit f4e8173a50
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/ceph-common/tasks/Debian.yml
View File

@ -38,4 +38,4 @@
- libcephfs1 #|
- name: Generate ceph configuration file
template: src=roles/ceph-common/templates/ceph.conf.j2 dest=/etc/ceph/ceph.conf owner=root group=root mode=0644
template: src=ceph.conf.j2 dest=/etc/ceph/ceph.conf owner=root group=root mode=0644

2
roles/ceph-common/tasks/RedHat.yml
View File

@ -31,4 +31,4 @@
yum: name=ceph state=latest
- name: Generate Ceph configuration file
template: src=roles/ceph-common/templates/ceph.conf.j2 dest=/etc/ceph/ceph.conf owner=root group=root mode=0644
template: src=ceph.conf.j2 dest=/etc/ceph/ceph.conf owner=root group=root mode=0644