Skip to content

Commit 0b315ef

Browse files
Update for large number of NVMe's
1 parent 617ce71 commit 0b315ef

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

playbooks/roles/localdisk/tasks/common.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
- name: Get the number of NVMe's
77
set_fact:
8-
nvme_count: "{{ hostvars[inventory_hostname]['ansible_devices'] | select('match','nvme[0-32]n1') | list | length}}"
8+
nvme_count: "{{ hostvars[inventory_hostname]['ansible_devices'] | select('match','nvme[0-9]|[1-9][0-9]n1') | list | length}}"
99

1010
- name: Create a LVM?
1111
set_fact:
@@ -18,15 +18,15 @@
1818
state: present
1919
label: gpt
2020
with_items:
21-
- "{{ hostvars[inventory_hostname]['ansible_devices'] | select('match','nvme[0-32]n1') | list }}"
21+
- "{{ hostvars[inventory_hostname]['ansible_devices'] | select('match','nvme[0-9]|[1-9][0-9]n1') | list }}"
2222

2323
- name: create a filesystem
2424
filesystem:
2525
dev: "/dev/{{item}}p1"
2626
fstype: xfs
2727
opts: "-L locscratch{{item | replace('nvme','') | replace('n1','')}}"
2828
with_items:
29-
- "{{ hostvars[inventory_hostname]['ansible_devices'] | select('match','nvme[0-32]n1') | list }}"
29+
- "{{ hostvars[inventory_hostname]['ansible_devices'] | select('match','nvme[0-9]|[1-9][0-9]n1') | list }}"
3030
when: not ( one_lv | bool )
3131

3232
- name: Mount local volume
@@ -37,7 +37,7 @@
3737
opts: defaults,noatime
3838
state: mounted
3939
with_items:
40-
- "{{ hostvars[inventory_hostname]['ansible_devices'] | select('match','nvme[0-32]n1') | list }}"
40+
- "{{ hostvars[inventory_hostname]['ansible_devices'] | select('match','nvme[0-9]|[1-9][0-9]n1') | list }}"
4141
when: not ( one_lv | bool )
4242

4343
- name: "set permissions on {{ nvme_path_edited }}"
@@ -50,7 +50,7 @@
5050
group: "{{privilege_group_name}}"
5151
recurse: no
5252
with_items:
53-
- "{{ hostvars[inventory_hostname]['ansible_devices'] | select('match','nvme[0-32]n1') | list }}"
53+
- "{{ hostvars[inventory_hostname]['ansible_devices'] | select('match','nvme[0-9]|[1-9][0-9]n1') | list }}"
5454
when: not ( one_lv | bool )
5555

5656
- name: Check for lvm devices
@@ -61,7 +61,7 @@
6161
- name: Create volume group
6262
lvg:
6363
vg: "vg_nvmes"
64-
pvs: "{{['/dev/']|product(hostvars[inventory_hostname]['ansible_devices'] | select('match','nvme[0-32]n1') | list)|map('join', '') | join(',')}}"
64+
pvs: "{{['/dev/']|product(hostvars[inventory_hostname]['ansible_devices'] | select('match','nvme[0-9]|[1-9][0-9]n1') | list)|map('join', '') | join(',')}}"
6565

6666
- name: Create Logical volume
6767
lvol:

0 commit comments

Comments
 (0)