From: Matthias Gerstner <matthias.gerstner@suse.de>
Date: Wed, 10 Jul 2019 11:00:14 +0000 (+0200)
Subject: packaging: remove SuSEfirewall2 support
X-Git-Tag: v15.1.0~2227^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d472e88441d5e0acb1fb3fa830653cbbf98e694c;p=ceph.git

packaging: remove SuSEfirewall2 support

removal of SuSEfirewall2 service, since SuSEfirewall2 has been replaced
by firewalld, see [1].

[1]: https://lists.opensuse.org/opensuse-factory/2019-01/msg00490.html

Fixes: http://tracker.ceph.com/issues/40738
Signed-off-by: Matthias Gerstner <matthias.gerstner@suse.de>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 3d70cebea58..85e5b0a4047 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -1256,8 +1256,6 @@ install -m 0644 -D etc/sysctl/90-ceph-osd.conf %{buildroot}%{_sysctldir}/90-ceph
 
 # firewall templates and /sbin/mount.ceph symlink
 %if 0%{?suse_version}
-install -m 0644 -D etc/sysconfig/SuSEfirewall2.d/services/ceph-mon %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-mon
-install -m 0644 -D etc/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds
 mkdir -p %{buildroot}/sbin
 ln -sf %{_sbindir}/mount.ceph %{buildroot}/sbin/mount.ceph
 %endif
@@ -1336,8 +1334,6 @@ rm -rf %{buildroot}
 %endif
 %if 0%{?suse_version}
 %{_fillupdir}/sysconfig.*
-%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-mon
-%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds
 %endif
 %{_unitdir}/ceph.target
 %if 0%{with python2}
diff --git a/etc/sysconfig/SuSEfirewall2.d/services/ceph-mon b/etc/sysconfig/SuSEfirewall2.d/services/ceph-mon
deleted file mode 100644
index 7a28e73a740..00000000000
--- a/etc/sysconfig/SuSEfirewall2.d/services/ceph-mon
+++ /dev/null
@@ -1,5 +0,0 @@
-## Name: Ceph MON
-## Description: Open port for Ceph Monitor
-
-# space separated list of allowed TCP ports
-TCP="6789"
diff --git a/etc/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds b/etc/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds
deleted file mode 100644
index 0109fde41be..00000000000
--- a/etc/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds
+++ /dev/null
@@ -1,5 +0,0 @@
-## Name: Ceph OSD/MDS
-## Description: Open ports for Ceph OSDs and Metadata Servers (max: 166 per node)
-
-# space separated list of allowed TCP ports
-TCP="6800:7300"