]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
osd: fix a typo in roles/ceph-osd/defaults/main.yml
authorGuillaume Abrioux <gabrioux@redhat.com>
Tue, 7 Nov 2017 08:48:29 +0000 (09:48 +0100)
committerGuillaume Abrioux <gabrioux@redhat.com>
Mon, 22 Jan 2018 16:53:03 +0000 (17:53 +0100)
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 39b584e540570ef79af98c3c23fdce90f02a701c)

group_vars/osds.yml.sample
roles/ceph-osd/defaults/main.yml

index d61654b7811d92a0a455a2b7014a68def8b97ca6..807b00a137f8960423a16eb8ae177b40857b3caf 100644 (file)
@@ -13,7 +13,7 @@ dummy:
 #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
 #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
 
 
@@ -93,7 +93,7 @@ dummy:
 
 # 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
-#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
@@ -116,7 +116,7 @@ dummy:
 # /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:
 #  - collocated
 #  - non-collocated
index 62eddb506e178c7d117651f8d40f4a1cd611c55c..1fd12f1edfbe8d4fe1bb10ec0acee701deb80624 100644 (file)
@@ -5,7 +5,7 @@
 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
 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
 
 
@@ -85,7 +85,7 @@ osd_auto_discovery: false
 
 # 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
-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
@@ -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"
 #
 
-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:
   - collocated
   - non-collocated