infra: don't restart firewalld if unit is masked

if firewalld.service systemd unit is masked, the handler will fail when
trying to restart it.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1650281
(cherry picked from commit 63b9835cbb0510415a2d0077697a0107e2d6c4f3)
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

diff --git a/roles/ceph-defaults/tasks/facts.yml b/roles/ceph-defaults/tasks/facts.yml
index 8c1ddf6525f869c45211f7ce908645bcac7ad0c6..45d7bba6eae0386e5362c746fa5a6224a8ddf126 100644 (file)
--- a/roles/ceph-defaults/tasks/facts.yml
+++ b/roles/ceph-defaults/tasks/facts.yml
@@ -239,3 +239,6 @@
     - ceph_current_status['servicemap'] is defined
     - ceph_current_status['servicemap']['services'] is defined
     - ceph_current_status['servicemap']['services']['rgw'] is defined
+
+- name: populate service facts
+  service_facts:

diff --git a/roles/ceph-infra/handlers/main.yml b/roles/ceph-infra/handlers/main.yml
index 5a9d5241080d0a363a3ffd09a72f649632230fe9..dc97de47b2dcf64574e6a44c470cc4809bc2ac3f 100644 (file)
--- a/roles/ceph-infra/handlers/main.yml
+++ b/roles/ceph-infra/handlers/main.yml
@@ -4,3 +4,6 @@
     name: firewalld
     state: restarted
     enabled: yes
+  when:
+    - ansible_facts['services']['firewalld.service'] is defined
+    - ansible_facts['services']['firewalld.service']['state'] != 'masked'
\ No newline at end of file