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 #2143 from ceph/fix_typo 

osd: fix a typo in roles/ceph-osd/defaults/main.yml
pull/2144/head
Guillaume Abrioux 2017-11-07 11:39:34 +01:00 committed by GitHub
parent 76d9c8e556 39b584e540
commit ef9635ca9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
group_vars/osds.yml.sample
View File

@ -13,7 +13,7 @@ dummy:
#raw_journal_devices: "{{ dedicated_devices }}" # backward compatibility with stable-2.2, will disappear in stable 3.1 #raw_journal_devices: "{{ dedicated_devices }}" # backward compatibility with stable-2.2, will disappear in stable 3.1
#journal_collocation: False # backward compatibility with stable-2.2, will disappear in stable 3.1 #journal_collocation: False # backward compatibility with stable-2.2, will disappear in stable 3.1
#raw_multi_journal: False # backward compatibility with stable-2.2, will disappear in stable 3.1 #raw_multi_journal: False # backward compatibility with stable-2.2, will disappear in stable 3.1
#dmcrytpt_journal_collocation: False # backward compatibility with stable-2.2, will disappear in stable 3.1 #dmcrypt_journal_collocation: False # backward compatibility with stable-2.2, will disappear in stable 3.1
#dmcrypt_dedicated_journal: False # backward compatibility with stable-2.2, will disappear in stable 3.1 #dmcrypt_dedicated_journal: False # backward compatibility with stable-2.2, will disappear in stable 3.1
@ -93,7 +93,7 @@ dummy:
# Encrypt your OSD device using dmcrypt # Encrypt your OSD device using dmcrypt
# If set to True, no matter which osd_objecstore and osd_scenario you use the data will be encrypted # If set to True, no matter which osd_objecstore and osd_scenario you use the data will be encrypted
#dmcrypt: "{{ True if dmcrytpt_journal_collocation or dmcrypt_dedicated_journal else False }}" # backward compatibility with stable-2.2, will disappear in stable 3.1 #dmcrypt: "{{ True if dmcrypt_journal_collocation or dmcrypt_dedicated_journal else False }}" # backward compatibility with stable-2.2, will disappear in stable 3.1
# I. First scenario: collocated # I. First scenario: collocated
@ -116,7 +116,7 @@ dummy:
# /dev/sda2: PARTLABEL="ceph block" PARTUUID="e6ca3e1d-4702-4569-abfa-e285de328e9d" # /dev/sda2: PARTLABEL="ceph block" PARTUUID="e6ca3e1d-4702-4569-abfa-e285de328e9d"
# #
#osd_scenario: "{{ 'collocated' if journal_collocation or dmcrytpt_journal_collocation else 'non-collocated' if raw_multi_journal or dmcrypt_dedicated_journal else 'dummy' }}" # backward compatibility with stable-2.2, will disappear in stable 3.1 #osd_scenario: "{{ 'collocated' if journal_collocation or dmcrypt_journal_collocation else 'non-collocated' if raw_multi_journal or dmcrypt_dedicated_journal else 'dummy' }}" # backward compatibility with stable-2.2, will disappear in stable 3.1
#valid_osd_scenarios: #valid_osd_scenarios:
# - collocated # - collocated
# - non-collocated # - non-collocated

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

@ -5,7 +5,7 @@
raw_journal_devices: "{{ dedicated_devices }}" # backward compatibility with stable-2.2, will disappear in stable 3.1 raw_journal_devices: "{{ dedicated_devices }}" # backward compatibility with stable-2.2, will disappear in stable 3.1
journal_collocation: False # backward compatibility with stable-2.2, will disappear in stable 3.1 journal_collocation: False # backward compatibility with stable-2.2, will disappear in stable 3.1
raw_multi_journal: False # backward compatibility with stable-2.2, will disappear in stable 3.1 raw_multi_journal: False # backward compatibility with stable-2.2, will disappear in stable 3.1
dmcrytpt_journal_collocation: False # backward compatibility with stable-2.2, will disappear in stable 3.1 dmcrypt_journal_collocation: False # backward compatibility with stable-2.2, will disappear in stable 3.1
dmcrypt_dedicated_journal: False # backward compatibility with stable-2.2, will disappear in stable 3.1 dmcrypt_dedicated_journal: False # backward compatibility with stable-2.2, will disappear in stable 3.1
@ -85,7 +85,7 @@ osd_auto_discovery: false
# Encrypt your OSD device using dmcrypt # Encrypt your OSD device using dmcrypt
# If set to True, no matter which osd_objecstore and osd_scenario you use the data will be encrypted # If set to True, no matter which osd_objecstore and osd_scenario you use the data will be encrypted
dmcrypt: "{{ True if dmcrytpt_journal_collocation or dmcrypt_dedicated_journal else False }}" # backward compatibility with stable-2.2, will disappear in stable 3.1 dmcrypt: "{{ True if dmcrypt_journal_collocation or dmcrypt_dedicated_journal else False }}" # backward compatibility with stable-2.2, will disappear in stable 3.1
# I. First scenario: collocated # I. First scenario: collocated
@ -108,7 +108,7 @@ dmcrypt: "{{ True if dmcrytpt_journal_collocation or dmcrypt_dedicated_journal e
# /dev/sda2: PARTLABEL="ceph block" PARTUUID="e6ca3e1d-4702-4569-abfa-e285de328e9d" # /dev/sda2: PARTLABEL="ceph block" PARTUUID="e6ca3e1d-4702-4569-abfa-e285de328e9d"
# #
osd_scenario: "{{ 'collocated' if journal_collocation or dmcrytpt_journal_collocation else 'non-collocated' if raw_multi_journal or dmcrypt_dedicated_journal else 'dummy' }}" # backward compatibility with stable-2.2, will disappear in stable 3.1 osd_scenario: "{{ 'collocated' if journal_collocation or dmcrypt_journal_collocation else 'non-collocated' if raw_multi_journal or dmcrypt_dedicated_journal else 'dummy' }}" # backward compatibility with stable-2.2, will disappear in stable 3.1
valid_osd_scenarios: valid_osd_scenarios:
- collocated - collocated
- non-collocated - non-collocated