From 168e631c579b36324abee945fb82034b0d44124d Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Fri, 23 Oct 2020 18:43:47 +0200 Subject: [PATCH] Skip tripleo_lvmfilter unless enabled or dry_run is set This is to address the concerns raised in [1]; it skips the role execution unless the feature is either explicitly enabled or the caller has set dry_run variable which will make it run up to the creation of the new lvm.conf file but not actually copy it into place. 1. https://review.opendev.org/#/c/697990/49/tripleo_ansible/roles/tripleo_lvmfilter/tasks/main.yml Change-Id: I1c914feda3c4b1bfb6dcfd981244477f82915b75 (cherry picked from commit d1a5769313d4bee52abff6efda64bc9182b42664) --- tripleo_ansible/roles/tripleo_lvmfilter/defaults/main.yml | 1 + tripleo_ansible/roles/tripleo_lvmfilter/tasks/main.yml | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tripleo_ansible/roles/tripleo_lvmfilter/defaults/main.yml b/tripleo_ansible/roles/tripleo_lvmfilter/defaults/main.yml index 6e00dc832..883876fd5 100644 --- a/tripleo_ansible/roles/tripleo_lvmfilter/defaults/main.yml +++ b/tripleo_ansible/roles/tripleo_lvmfilter/defaults/main.yml @@ -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: [] diff --git a/tripleo_ansible/roles/tripleo_lvmfilter/tasks/main.yml b/tripleo_ansible/roles/tripleo_lvmfilter/tasks/main.yml index 62c8db9f1..a08e030e8 100644 --- a/tripleo_ansible/roles/tripleo_lvmfilter/tasks/main.yml +++ b/tripleo_ansible/roles/tripleo_lvmfilter/tasks/main.yml @@ -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