Merge pull request #28957 from mgerstner/sfw2

rpm,etc/sysconfig: remove SuSEfirewall2 support

Reviewed-by: Tim Serong <tserong@suse.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
This commit is contained in:
Nathan Cutler 2019-07-12 12:09:54 +02:00 committed by GitHub
commit ecbc582caf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 14 deletions

View File

@ -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}

View File

@ -1,5 +0,0 @@
## Name: Ceph MON
## Description: Open port for Ceph Monitor
# space separated list of allowed TCP ports
TCP="6789"

View File

@ -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"