From: Sage Weil <sage@redhat.com>
Date: Wed, 25 Jul 2018 21:22:09 +0000 (-0500)
Subject: Revert "rpm,deb: chown bluestore block* links to ceph.ceph on install/upgrade"
X-Git-Tag: v14.0.1~772^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=2c4e26eb448a43e25264c1089de63292f735ca0a;p=ceph.git

Revert "rpm,deb: chown bluestore block* links to ceph.ceph on install/upgrade"

This reverts commit 58cde3fd793c037beca6645cc30b2ae1c30e2af1.

This was only needed for luminous and mimic.  We are keeping these commits in master (and reverting them) only so that the cherry-pick -x references work.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 8415e2e6e9a2f..f155092fbe2b5 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -1533,8 +1533,6 @@ fi
 %else
     /usr/lib/systemd/systemd-sysctl %{_sysctldir}/90-ceph-osd.conf > /dev/null 2>&1 || :
 %endif
-# work around https://tracker.ceph.com/issues/24903
-chown ceph:ceph /var/lib/ceph/osd/*/block* 2>&1 > /dev/null || :
 
 %preun osd
 %if 0%{?suse_version}
diff --git a/debian/ceph-osd.postinst b/debian/ceph-osd.postinst
index 6ae5349bce0ed..5e44548fe8261 100644
--- a/debian/ceph-osd.postinst
+++ b/debian/ceph-osd.postinst
@@ -25,8 +25,6 @@ case "$1" in
     configure)
 	[ -x /etc/init.d/procps ] && invoke-rc.d procps restart || :
 	[ -x /sbin/start ] && start ceph-osd-all || :
-	# work around https://tracker.ceph.com/issues/24903
-	chown ceph:ceph /var/lib/ceph/osd/*/block* 2>&1 > /dev/null || :
     ;;
     abort-upgrade|abort-remove|abort-deconfigure)
 	: