Make {{ raw_journal_devices }} list optional: define it as empty list by default...

Signed-off-by: Eduard Egorov <eduard.egorov@icl-services.com>

diff --git a/group_vars/osds.sample b/group_vars/osds.sample
index 23713d1012e658861e71f86ebb285ceee330905c..88d1b6b6282381e8454219462dc6bfa7dd148a3c 100644 (file)
--- a/group_vars/osds.sample
+++ b/group_vars/osds.sample
@@ -134,6 +134,7 @@ dummy:
 #  - /dev/sdf
 #  - /dev/sdg
 #  - /dev/sdg
+#raw_journal_devices: []
 
 
 # III. Use directory instead of disk for OSDs

diff --git a/roles/ceph-osd/defaults/main.yml b/roles/ceph-osd/defaults/main.yml
index a39814514be48665ed60e4bb79c8579fcbfa6695..a4757f9e87fc47f51210b458baed3487864b8e2e 100644 (file)
--- a/roles/ceph-osd/defaults/main.yml
+++ b/roles/ceph-osd/defaults/main.yml
@@ -126,6 +126,7 @@ raw_multi_journal: false
 #  - /dev/sdf
 #  - /dev/sdg
 #  - /dev/sdg
+raw_journal_devices: []
 
 
 # III. Use directory instead of disk for OSDs

diff --git a/roles/ceph-osd/tasks/check_devices.yml b/roles/ceph-osd/tasks/check_devices.yml
index 541aa7436646c51f1ac3335cfa2a5235d5ace767..547cd295e708f492766c75f2e226d0876a44314e 100644 (file)
--- a/roles/ceph-osd/tasks/check_devices.yml
+++ b/roles/ceph-osd/tasks/check_devices.yml
@@ -22,7 +22,7 @@
 
 - name: check the partition status of the journal devices
   shell: "parted --script {{ item }} print > /dev/null 2>&1"
-  with_items: "{{ raw_journal_devices|default([])|unique }}"
+  with_items: "{{ raw_journal_devices|unique }}"
   changed_when: false
   failed_when: false
   register: journal_partition_status
@@ -32,7 +32,7 @@
   shell: "sgdisk --zap-all --clear --mbrtogpt -- {{ item.1 }} || sgdisk --zap-all --clear --mbrtogpt -- {{ item.1 }}"
   with_together:
     - "{{ journal_partition_status.results }}"
-    - "{{ raw_journal_devices|default([])|unique }}"
+    - "{{ raw_journal_devices|unique }}"
   changed_when: false
   when:
     - raw_multi_journal