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 #1376 from czunker/fix_osd_crush_location 

Fix osd_crush_location to prevent systemd error message
pull/1345/head
Sébastien Han 2017-03-21 09:41:10 +01:00 committed by GitHub
parent 28042eb032 09646041ee
commit 839e0fdf4d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
group_vars/osds.yml.sample
View File

@ -59,7 +59,7 @@ dummy:
# osd0 ceph_crush_root=foo ceph_crush_rack=bar # osd0 ceph_crush_root=foo ceph_crush_rack=bar
#crush_location: false #crush_location: false
#osd_crush_location: "'root={{ ceph_crush_root }} rack={{ ceph_crush_rack }} host={{ ansible_hostname }}'" #osd_crush_location: "\"root={{ ceph_crush_root }} rack={{ ceph_crush_rack }} host={{ ansible_hostname }}\""
############## ##############
@ -119,7 +119,7 @@ dummy:
# II. Second scenario: N journal devices for N OSDs # II. Second scenario: N journal devices for N OSDs
# Use 'true' for 'raw_multi_journal' to enable this scenario # Use 'true' for 'raw_multi_journal' to enable this scenario
# List devices under 'devices' variable above and # List devices under 'devices' variable above and
# write journal devices for those under 'raw_journal_devices' # write journal devices for those under 'raw_journal_devices'
# In the following example: # In the following example:
# * sdb and sdc will get sdf as a journal # * sdb and sdc will get sdf as a journal

4
roles/ceph-osd/defaults/main.yml
View File

@ -51,7 +51,7 @@ copy_admin_key: false
# osd0 ceph_crush_root=foo ceph_crush_rack=bar # osd0 ceph_crush_root=foo ceph_crush_rack=bar
crush_location: false crush_location: false
osd_crush_location: "'root={{ ceph_crush_root }} rack={{ ceph_crush_rack }} host={{ ansible_hostname }}'" osd_crush_location: "\"root={{ ceph_crush_root }} rack={{ ceph_crush_rack }} host={{ ansible_hostname }}\""
############## ##############
@ -111,7 +111,7 @@ journal_collocation: false
# II. Second scenario: N journal devices for N OSDs # II. Second scenario: N journal devices for N OSDs
# Use 'true' for 'raw_multi_journal' to enable this scenario # Use 'true' for 'raw_multi_journal' to enable this scenario
# List devices under 'devices' variable above and # List devices under 'devices' variable above and
# write journal devices for those under 'raw_journal_devices' # write journal devices for those under 'raw_journal_devices'
# In the following example: # In the following example:
# * sdb and sdc will get sdf as a journal # * sdb and sdc will get sdf as a journal