From c13263753dd58984a413d9d3de19d4935f677194 Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Thu, 23 Sep 2021 17:25:07 +0200 Subject: [PATCH] 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 7c2467c9821c2ec0135e560157ac9443c62b0d80) (cherry picked from commit 4ceb98f2df0a76767c04a4f809718e1cd3b4e0d4) (cherry picked from commit 810fb36e3bd4a225ad44aebbc10a263bbe800d50) (cherry picked from commit 2050d66047a256c6eafdbe2c7d823414ca8755a9) --- tripleo_ansible/roles/tripleo_lvmfilter/tasks/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tripleo_ansible/roles/tripleo_lvmfilter/tasks/main.yml b/tripleo_ansible/roles/tripleo_lvmfilter/tasks/main.yml index 8aa437c74..7f36f8bdd 100644 --- a/tripleo_ansible/roles/tripleo_lvmfilter/tasks/main.yml +++ b/tripleo_ansible/roles/tripleo_lvmfilter/tasks/main.yml @@ -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: >