rgw: install rgw scripts with common files rather than radosgw files

Update ceph.spec.in and debian install files so
rgw-restore-bucket-index, rgw-orphan-list, rgw-gap-list,
rgw-gap-list-comparator are installed with common files.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit 637d461bf12b68d2c04f326139367dcfda0664ce)

diff --git a/ceph.spec.in b/ceph.spec.in
index cff5f798b76ace93b342c0e12c093c738ae69f60..e89d63b2bbbc332fd57af686fd336024ea5e89bd 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -1670,6 +1670,10 @@ exit 0
 %{_bindir}/rbd-replay
 %{_bindir}/rbd-replay-many
 %{_bindir}/rbdmap
+%{_bindir}/rgw-gap-list
+%{_bindir}/rgw-gap-list-comparator
+%{_bindir}/rgw-orphan-list
+%{_bindir}/rgw-restore-bucket-index
 %{_sbindir}/mount.ceph
 %if 0%{?suse_version} && 0%{?suse_version} < 1550
 /sbin/mount.ceph
@@ -2127,11 +2131,7 @@ fi
 %{_bindir}/radosgw-token
 %{_bindir}/radosgw-es
 %{_bindir}/radosgw-object-expirer
-%{_bindir}/rgw-gap-list
-%{_bindir}/rgw-gap-list-comparator
-%{_bindir}/rgw-orphan-list
 %{_bindir}/rgw-policy-check
-%{_bindir}/rgw-restore-bucket-index
 %{_mandir}/man8/radosgw.8*
 %{_mandir}/man8/rgw-policy-check.8*
 %dir %{_localstatedir}/lib/ceph/radosgw

diff --git a/debian/ceph-common.install b/debian/ceph-common.install
index 1c787b05f5920f75ab1cd5e03e6f5cbea7894b88..fc4da0a179c80fac113ab8c7cb21a8b80419fbab 100755 (executable)
--- a/debian/ceph-common.install
+++ b/debian/ceph-common.install
@@ -18,6 +18,10 @@ usr/bin/cephfs-table-tool
 usr/bin/crushdiff
 usr/bin/rados
 usr/bin/radosgw-admin
+usr/bin/rgw-gap-list
+usr/bin/rgw-gap-list-comparator
+usr/bin/rgw-orphan-list
+usr/bin/rgw-restore-bucket-index
 usr/bin/rbd
 usr/bin/rbdmap
 usr/bin/rbd-replay*

diff --git a/debian/radosgw.install b/debian/radosgw.install
index df522926619fac46e5c1885507b61f044cd83fd6..b0367e8f651f9107db196ded9b3e4a4caee8159d 100644 (file)
--- a/debian/radosgw.install
+++ b/debian/radosgw.install
@@ -4,10 +4,6 @@ usr/bin/radosgw
 usr/bin/radosgw-es
 usr/bin/radosgw-object-expirer
 usr/bin/radosgw-token
-usr/bin/rgw-gap-list
-usr/bin/rgw-gap-list-comparator
-usr/bin/rgw-orphan-list
-usr/bin/rgw-restore-bucket-index
 usr/share/man/man8/ceph-diff-sorted.8
 usr/share/man/man8/radosgw.8
 usr/share/man/man8/rgw-orphan-list.8