From dd4a4cbb66b811c2566386e2baaa786310da98f1 Mon Sep 17 00:00:00 2001
From: Dimitri Savineau <dsavinea@redhat.com>
Date: Fri, 15 Feb 2019 15:58:04 -0500
Subject: [PATCH] ceph-infra: Remove restart firewalld handler

There's no need to restart firewalld service when a new rule is
added due to the usage of the immediate flag.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit b7338d438a18b6de9083e4302d809ead7a46b6c6)
---
 roles/ceph-infra/handlers/main.yml            |  6 ------
 roles/ceph-infra/tasks/configure_firewall.yml | 10 ----------
 2 files changed, 16 deletions(-)

diff --git a/roles/ceph-infra/handlers/main.yml b/roles/ceph-infra/handlers/main.yml
index 31d3d35a9..d18b5d955 100644
--- a/roles/ceph-infra/handlers/main.yml
+++ b/roles/ceph-infra/handlers/main.yml
@@ -1,10 +1,4 @@
 ---
-- name: restart firewalld
-  service:
-    name: firewalld
-    state: restarted
-    enabled: yes
-
 - name: disable ntpd
   failed_when: false
   service:
diff --git a/roles/ceph-infra/tasks/configure_firewall.yml b/roles/ceph-infra/tasks/configure_firewall.yml
index 98fbcbfe2..a86a0b3f9 100644
--- a/roles/ceph-infra/tasks/configure_firewall.yml
+++ b/roles/ceph-infra/tasks/configure_firewall.yml
@@ -24,7 +24,6 @@
       permanent: true
       immediate: true
       state: enabled
-    notify: restart firewalld
     with_items:
       - { 'service': 'ceph-mon', 'zone': "{{ ceph_mon_firewall_zone }}" }
       - { 'service': 'ceph', 'zone': "{{ ceph_mgr_firewall_zone }}" }
@@ -42,7 +41,6 @@
       permanent: true
       immediate: true
       state: enabled
-    notify: restart firewalld
     when:
       - mgr_group_name is defined
       - mgr_group_name in group_names
@@ -60,7 +58,6 @@
     with_items:
       - "{{ public_network }}"
       - "{{ cluster_network }}"
-    notify: restart firewalld
     when:
       - osd_group_name is defined
       - osd_group_name in group_names
@@ -75,7 +72,6 @@
       permanent: true
       immediate: true
       state: enabled
-    notify: restart firewalld
     when:
       - rgw_group_name is defined
       - rgw_group_name in group_names
@@ -90,7 +86,6 @@
       permanent: true
       immediate: true
       state: enabled
-    notify: restart firewalld
     when:
       - mds_group_name is defined
       - mds_group_name in group_names
@@ -105,7 +100,6 @@
       permanent: true
       immediate: true
       state: enabled
-    notify: restart firewalld
     when:
       - nfs_group_name is defined
       - nfs_group_name in group_names
@@ -120,7 +114,6 @@
       permanent: true
       immediate: true
       state: enabled
-    notify: restart firewalld
     when:
       - nfs_group_name is defined
       - nfs_group_name in group_names
@@ -135,7 +128,6 @@
       permanent: true
       immediate: true
       state: enabled
-    notify: restart firewalld
     when:
       - rbdmirror_group_name is defined
       - rbdmirror_group_name in group_names
@@ -150,7 +142,6 @@
       permanent: true
       immediate: true
       state: enabled
-    notify: restart firewalld
     when:
       - iscsi_gw_group_name is defined
       - iscsi_gw_group_name in group_names
@@ -165,7 +156,6 @@
       permanent: true
       immediate: true
       state: enabled
-    notify: restart firewalld
     when:
       - iscsi_gw_group_name is defined
       - iscsi_gw_group_name in group_names