From: David Disseldorp <ddiss@suse.de>
Date: Tue, 14 Nov 2017 14:55:39 +0000 (+0100)
Subject: sysctl: relocate 90-ceph-osd.conf under etc/sysctl/
X-Git-Tag: v12.2.3~118^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=718528304063c7ea03d7777c3eaf6e26a0900f59;p=ceph.git

sysctl: relocate 90-ceph-osd.conf under etc/sysctl/

Signed-off-by: David Disseldorp <ddiss@suse.de>
(cherry picked from commit 4d0b70068894af2d9c2c4b6fea1451a47864bfd8)
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 4ff8ccd74f9..b8e462c26d3 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -884,7 +884,7 @@ mkdir -p %{buildroot}%{_sbindir}
 install -m 0644 -D src/logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.d/ceph
 chmod 0644 %{buildroot}%{_docdir}/ceph/sample.ceph.conf
 install -m 0644 -D COPYING %{buildroot}%{_docdir}/ceph/COPYING
-install -m 0644 -D src/90-ceph-osd.conf %{buildroot}%{_sysctldir}/90-ceph-osd.conf
+install -m 0644 -D etc/sysctl/90-ceph-osd.conf %{buildroot}%{_sysctldir}/90-ceph-osd.conf
 
 # firewall templates and /sbin/mount.ceph symlink
 %if 0%{?suse_version}
diff --git a/debian/rules b/debian/rules
index 857888f84e7..e9ddc579743 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,7 +50,7 @@ override_dh_auto_install:
 	install -D -m 644 udev/95-ceph-osd.rules $(DESTDIR)/lib/udev/rules.d/95-ceph-osd.rules
 	install -D -m 644 udev/60-ceph-by-parttypeuuid.rules $(DESTDIR)/lib/udev/rules.d/60-ceph-by-parttypeuuid.rules
 	install -D -m 644 src/etc-rbdmap $(DESTDIR)/etc/ceph/rbdmap
-	install -D -m 644 src/90-ceph-osd.conf $(DESTDIR)/etc/sysctl.d/30-ceph-osd.conf
+	install -D -m 644 etc/sysctl/90-ceph-osd.conf $(DESTDIR)/etc/sysctl.d/30-ceph-osd.conf
 
 # doc/changelog is a directory, which confuses dh_installchangelogs
 override_dh_installchangelogs:
diff --git a/etc/sysctl/90-ceph-osd.conf b/etc/sysctl/90-ceph-osd.conf
new file mode 100644
index 00000000000..c5c64bb7052
--- /dev/null
+++ b/etc/sysctl/90-ceph-osd.conf
@@ -0,0 +1 @@
+fs.aio-max-nr = 1048576
diff --git a/src/90-ceph-osd.conf b/src/90-ceph-osd.conf
deleted file mode 100644
index c5c64bb7052..00000000000
--- a/src/90-ceph-osd.conf
+++ /dev/null
@@ -1 +0,0 @@
-fs.aio-max-nr = 1048576