From 2c9823d0256f1d9fd037e60c2445a4ef74a18f9e Mon Sep 17 00:00:00 2001
From: Sergey Reshetnyak <sreshetniak@mirantis.com>
Date: Mon, 6 Jul 2015 12:49:36 +0300
Subject: [PATCH] Disable firewall on rhel-based distros only

disable-firewall element supports only rhel-based distros.
This patch adds distro check in disable-firewall element.

Change-Id: I9763b6ee98e4fcc5de127ad7e11c9a0dfaf7fb81
---
 .../post-install.d/30-disable-firewalld           | 13 ++++++++++---
 .../post-install.d/31-disable-ip6tables           | 15 +++++++++++----
 .../post-install.d/32-disable-iptables            | 15 +++++++++++----
 3 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/elements/disable-firewall/post-install.d/30-disable-firewalld b/elements/disable-firewall/post-install.d/30-disable-firewalld
index 108a9929..ac0936b3 100755
--- a/elements/disable-firewall/post-install.d/30-disable-firewalld
+++ b/elements/disable-firewall/post-install.d/30-disable-firewalld
@@ -6,6 +6,13 @@ fi
 set -eu
 set -o pipefail
 
-if which systemctl; then
-    systemctl disable firewalld
-fi
+case "${DISTRO_NAME}" in
+    fedora | centos | rhel )
+        if which systemctl; then
+            systemctl disable firewalld
+        fi
+    ;;
+    * )
+        echo "Unknown distro: $DISTRO_NAME. Skipping."
+    ;;
+esac
diff --git a/elements/disable-firewall/post-install.d/31-disable-ip6tables b/elements/disable-firewall/post-install.d/31-disable-ip6tables
index b28f5ff9..626a09ec 100755
--- a/elements/disable-firewall/post-install.d/31-disable-ip6tables
+++ b/elements/disable-firewall/post-install.d/31-disable-ip6tables
@@ -10,7 +10,14 @@ if [ "$DISTRO_NAME" = "fedora" ]; then
     install-packages iptables-services
 fi
 
-if which service; then
-    service ip6tables save
-    chkconfig ip6tables off
-fi
+case "${DISTRO_NAME}" in
+    fedora | centos | rhel )
+        if which service; then
+            service ip6tables save
+            chkconfig ip6tables off
+        fi
+    ;;
+    * )
+        echo "Unknown distro: $DISTRO_NAME. Skipping."
+    ;;
+esac
diff --git a/elements/disable-firewall/post-install.d/32-disable-iptables b/elements/disable-firewall/post-install.d/32-disable-iptables
index 9d33634d..e8dab3ad 100755
--- a/elements/disable-firewall/post-install.d/32-disable-iptables
+++ b/elements/disable-firewall/post-install.d/32-disable-iptables
@@ -10,7 +10,14 @@ if [ "$DISTRO_NAME" = "fedora" ]; then
     install-packages iptables-services
 fi
 
-if which service; then
-    service iptables save
-    chkconfig iptables off
-fi
+case "${DISTRO_NAME}" in
+    fedora | centos | rhel )
+        if which service; then
+            service iptables save
+            chkconfig iptables off
+        fi
+    ;;
+    * )
+        echo "Unknown distro: $DISTRO_NAME. Skipping."
+    ;;
+esac