Merge "Skip tripleo_lvmfilter unless enabled or dry_run is set" into stable/ussuri

This commit is contained in:
Zuul 2020-10-28 16:07:49 +00:00 committed by Gerrit Code Review
commit 1df44d962e
2 changed files with 4 additions and 1 deletions

View File

@ -19,5 +19,6 @@
# All variables within this role should have a prefix of "tripleo_tripleo_lvmfilter"
tripleo_tripleo_lvmfilter_enabled: false
tripleo_tripleo_lvmfilter_dry_run: false
tripleo_tripleo_lvmfilter_devices_allowlist: []
tripleo_tripleo_lvmfilter_devices_denylist: []

View File

@ -19,7 +19,9 @@
package_facts:
manager: auto
- name: gather allowed block devices list
when: "'lvm2' in ansible_facts.packages"
when:
- "'lvm2' in ansible_facts.packages"
- tripleo_tripleo_lvmfilter_enabled or tripleo_tripleo_lvmfilter_dry_run
block:
- name: collect in-use lvm2 devices list
become: true