Make {{ devices }} list optional: define it as empty list by default, remove unnecces...

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

diff --git a/group_vars/osds.sample b/group_vars/osds.sample
index 71ac1acf745ccbffd8f24b861bf87b2aa6aad0ad..23713d1012e658861e71f86ebb285ceee330905c 100644 (file)
--- a/group_vars/osds.sample
+++ b/group_vars/osds.sample
@@ -86,6 +86,8 @@ dummy:
 #  - /dev/sdd
 #  - /dev/sde
 
+#devices: []
+
 
 #'osd_auto_discovery'  mode prevents you from filling out the 'devices' variable above.
 #  You can use this option with First and Forth and Fifth OSDS scenario.

diff --git a/infrastructure-playbooks/purge-cluster.yml b/infrastructure-playbooks/purge-cluster.yml
index ac1e89ee135a2428c2ba047a5e18f8430f5ee3a7..4e1b288a16c206ed28c7b1713f899c441c9d0e1f 100644 (file)
--- a/infrastructure-playbooks/purge-cluster.yml
+++ b/infrastructure-playbooks/purge-cluster.yml
@@ -402,7 +402,7 @@
 
   - name: zap osd disks
     shell: ceph-disk zap "{{ item }}"
-    with_items: "{{ devices | default([]) }}"
+    with_items: "{{ devices }}"
     when:
      ceph_disk_present.rc == 0 and
      ceph_data_partlabels.rc == 0 and

diff --git a/roles/ceph-osd/defaults/main.yml b/roles/ceph-osd/defaults/main.yml
index 8baf84fbe99d755c48d0fa533c9f98a91cd4e60e..a39814514be48665ed60e4bb79c8579fcbfa6695 100644 (file)
--- a/roles/ceph-osd/defaults/main.yml
+++ b/roles/ceph-osd/defaults/main.yml
@@ -78,6 +78,8 @@ cephx: true
 #  - /dev/sdd
 #  - /dev/sde
 
+devices: []
+
 
 #'osd_auto_discovery'  mode prevents you from filling out the 'devices' variable above.
 #  You can use this option with First and Forth and Fifth OSDS scenario.

diff --git a/roles/ceph-osd/tasks/activate_osds.yml b/roles/ceph-osd/tasks/activate_osds.yml
index dab0ee529170aa0462b932004d369794021084be..834ac3eacacc8302022e2084015940c6a90df47d 100644 (file)
--- a/roles/ceph-osd/tasks/activate_osds.yml
+++ b/roles/ceph-osd/tasks/activate_osds.yml
@@ -17,7 +17,7 @@
   command: ceph-disk activate {{ item.1 | regex_replace('^(\/dev\/cciss\/c[0-9]{1}d[0-9]{1})$', '\\1p') }}1
   with_together:
     - "{{ ispartition_results.results }}"
-    - "{{ devices|default([])|unique }}"
+    - "{{ devices|unique }}"
   changed_when: false
   failed_when: false
   register: activate_osd_disk
@@ -42,7 +42,7 @@
   command: ceph-disk activate --dmcrypt {{ item.1 | regex_replace('^(\/dev\/cciss\/c[0-9]{1}d[0-9]{1})$', '\\1p') }}1
   with_together:
     - "{{ ispartition_results.results }}"
-    - "{{ devices|default([])|unique }}"
+    - "{{ devices|unique }}"
   changed_when: false
   failed_when: false
   register: activate_osd_disk_dmcrypt
@@ -70,7 +70,7 @@
   command: "ceph-disk activate {{ item.1 }}"
   with_together:
     - "{{ ispartition_results.results }}"
-    - "{{ devices|default([])|unique }}"
+    - "{{ devices|unique }}"
   changed_when: false
   failed_when: false
   when: