Merge "Allow LVM filter to work when either allowlist or denylist are empty" into stable/train
This commit is contained in:
commit
71b1428cd3
|
@ -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: >
|
||||
|
|
Loading…
Reference in New Issue