From f33c1cd2d26fb20c81ed218ddec98dedeac981a7 Mon Sep 17 00:00:00 2001 From: Eduard Egorov Date: Mon, 10 Oct 2016 13:16:03 +0000 Subject: [PATCH] Make {{ devices }} list optional: define it as empty list by default, remove unneccessary 'default([])' checks Signed-off-by: Eduard Egorov --- group_vars/osds.sample | 2 ++ infrastructure-playbooks/purge-cluster.yml | 2 +- roles/ceph-osd/defaults/main.yml | 2 ++ roles/ceph-osd/tasks/activate_osds.yml | 6 +++--- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/group_vars/osds.sample b/group_vars/osds.sample index 71ac1acf7..23713d101 100644 --- 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 ac1e89ee1..4e1b288a1 100644 --- 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 8baf84fbe..a39814514 100644 --- 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 dab0ee529..834ac3eac 100644 --- 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: -- 2.39.5