Allow LVM filter to work when either allowlist or denylist are empty

Fixes the LVM filter task for it to build correctly formatted lists
when either one of allowlist or denylist are empty.

Change-Id: Ib3e8bfbabbd9c46af8aa032b23d68b8918cc444d
Closes-Bug: 1944743
(cherry picked from commit 7c2467c982)
(cherry picked from commit 4ceb98f2df)
This commit is contained in:
Giulio Fidente 2021-09-23 17:25:07 +02:00
parent f9fab0d148
commit 810fb36e3b
1 changed files with 5 additions and 5 deletions

View File

@ -44,15 +44,15 @@
| unique }}"
- name: build lvm2 allow list
set_fact:
lvm2_allow_list: "\"{{ allowed_devices | map('regex_replace', '(.+)', 'a|\\1|')
| join('\",\"') }}\""
lvm2_allow_list: "{{ allowed_devices
| map('regex_replace', '(.+)', 'a|\\1|') | list }}"
- name: build lvm2 deny list
set_fact:
lvm2_deny_list: "\"{{ tripleo_tripleo_lvmfilter_devices_denylist | default([])
| map('regex_replace', '(.+)', 'r|\\1|') | join('\",\"') }}\""
lvm2_deny_list: "{{ tripleo_tripleo_lvmfilter_devices_denylist | default([])
| map('regex_replace', '(.+)', 'r|\\1|') | list }}"
- name: build lvm2 filter
set_fact:
lvm2_filter: "{{ lvm2_allow_list + ',' + lvm2_deny_list }}"
lvm2_filter: "\"{{ (lvm2_allow_list + lvm2_deny_list) | join('\",\"') }}\""
- name: regenerate lvm config
become: true
command: >