Merge branch '2.10.5' into 2.10.5_ds_nccl_conf

Author: shethdhvani

playbooks/roles/localdisk/tasks/common.yml

@@ -18,15 +18,15 @@
     state: present
     label: gpt
   with_items:
-    - "{{ hostvars[inventory_hostname]['ansible_devices'] | select('match','nvme[0-9]|[1-9][0-9]n1') | list }}"
+    - "{{ (hostvars[inventory_hostname]['ansible_devices'] | select('match','nvme[1-9][0-9]n1') | list ) + (hostvars[inventory_hostname]['ansible_devices'] | select('match','nvme[0-9]n1') | list) }}"
 
 - name: create a filesystem
   filesystem:
     dev: "/dev/{{item}}p1"
     fstype: xfs
     opts: "-L locscratch{{item | replace('nvme','') | replace('n1','')}}"
   with_items:
-    - "{{ hostvars[inventory_hostname]['ansible_devices'] | select('match','nvme[0-9]|[1-9][0-9]n1') | list }}"
+    - "{{ (hostvars[inventory_hostname]['ansible_devices'] | select('match','nvme[1-9][0-9]n1') | list ) + (hostvars[inventory_hostname]['ansible_devices'] | select('match','nvme[0-9]n1') | list) }}"
   when: not ( one_lv | bool )
 
 - name: Mount local volume
@@ -37,7 +37,7 @@
     opts: defaults,noatime
     state: mounted
   with_items:
-    - "{{ hostvars[inventory_hostname]['ansible_devices'] | select('match','nvme[0-9]|[1-9][0-9]n1') | list }}"
+    - "{{ (hostvars[inventory_hostname]['ansible_devices'] | select('match','nvme[1-9][0-9]n1') | list ) + (hostvars[inventory_hostname]['ansible_devices'] | select('match','nvme[0-9]n1') | list) }}"
   when: not ( one_lv | bool )
 
 - name: "set permissions on {{ nvme_path_edited }}"
@@ -50,7 +50,7 @@
     group: "{{privilege_group_name}}"
     recurse: no
   with_items:
-    - "{{ hostvars[inventory_hostname]['ansible_devices'] | select('match','nvme[0-9]|[1-9][0-9]n1') | list }}"
+    - "{{ (hostvars[inventory_hostname]['ansible_devices'] | select('match','nvme[1-9][0-9]n1') | list ) + (hostvars[inventory_hostname]['ansible_devices'] | select('match','nvme[0-9]n1') | list) }}"
   when: not ( one_lv | bool )
 
 - name: Check for lvm devices
@@ -61,7 +61,7 @@
     - name: Create volume group
       lvg:
         vg: "vg_nvmes"
-        pvs: "{{['/dev/']|product(hostvars[inventory_hostname]['ansible_devices'] | select('match','nvme[0-9]|[1-9][0-9]n1') | list)|map('join', '') | join(',')}}"
+        pvs: "{{['/dev/']|product((hostvars[inventory_hostname]['ansible_devices'] | select('match','nvme[1-9][0-9]n1') | list ) + (hostvars[inventory_hostname]['ansible_devices'] | select('match','nvme[0-9]n1') | list) )|map('join', '') | join(',')}}"
 
     - name: Create Logical volume
       lvol: