Merge pull request #96 from mnasiadka/ansible_facts_distribution

Change ansible_distribution usage to ansible_facts

tasks/centos.yml

@@ -44,8 +44,8 @@
 - block:
   - name: centos | installing sg3_utils
     package:
-    name: sg3_utils
-    state: present
+      name: sg3_utils
+      state: present
     become: true
 
   - name: centos | checking for scsi devices
@@ -55,13 +55,13 @@
     changed_when: false
 
   - name: centos | rescanning for new disks
-    command: /usr/bin/rescan-scsi-bus.sh
+    command: "{{ rescan_scsi_command }}"
     become: true
     changed_when: false
     when: scsi_devices.stdout|length > 0
 
   - name: centos | rescanning for resized disks
-    command: /usr/bin/rescan-scsi-bus.sh -s
+    command: "{{ rescan_scsi_command }} -s"
     become: true
     changed_when: false
     when: scsi_devices.stdout|length > 0

tasks/create_fs.yml

@@ -45,6 +45,7 @@
     - lv.create|bool
     - lv.filesystem is defined
     - lv.filesystem != 'None'
+    - lv.filesystem != 'swap'
     - lv.filesystem != 'xfs'
 
 - name: create_fs | creating new xfs filesystem on new LVM logical volume(s)

tasks/debian.yml

@@ -34,7 +34,7 @@
   changed_when: false
 
 - name: debian | rescanning for new disks added
-  command: /sbin/rescan-scsi-bus
+  command: "{{ rescan_scsi_command }}"
   become: true
   changed_when: false
   when: scsi_devices['stdout'] | length

tasks/main.yml

@@ -1,5 +1,13 @@
 ---
 # tasks file for ansible-manage-lvm
+- name: Set rescan_scsi_command for old debian version
+  set_fact:
+    rescan_scsi_command: "/sbin/rescan-scsi-bus"
+  when:
+    - ansible_facts.distribution | replace(' ','') | lower == 'debian'
+    - ansible_facts.distribution_release not in ('bookworm', 'sid')
+    - ansible_facts.distribution_major_version is version(10, '<=')
+
 - include_tasks: debian.yml
   when: ansible_facts.os_family == "Debian"
 

vars/main.yml

@@ -3,3 +3,5 @@
 
 ebsnvme_binary_helper_file: go-ebsnvme_{{ ebsnvme_binary_helper_ver }}_linux_amd64.tar.gz
 ebsnvme_binary_helper_url:  https://github.com/mvisonneau/go-ebsnvme/releases/download/{{ ebsnvme_binary_helper_ver }}/{{ ebsnvme_binary_helper_file }}
+
+rescan_scsi_command: "/usr/bin/rescan-scsi-bus.sh"