From 4258c4772a7158e7fa8921e17320e495f7aba74e Mon Sep 17 00:00:00 2001
From: Thomas Bechtold <tbechtold@suse.com>
Date: Thu, 7 Nov 2019 16:41:23 +0100
Subject: [PATCH] ceph-daemon: Move ceph-daemon executable to own directory

Moving ceph-daemon into src/ceph-daemon/ makes it simpler to add extra
code (eg. tox.ini, README, unittests, ...) specific to ceph-daemon.
That way related files are in a single directory.

Signed-off-by: Thomas Bechtold <tbechtold@suse.com>
---
 ceph.spec.in                      |  2 +-
 debian/rules                      |  2 +-
 doc/bootstrap.rst                 |  2 +-
 qa/standalone/test_ceph_daemon.sh |  5 +++--
 src/{ => ceph-daemon}/ceph-daemon |  0
 src/vstart.sh                     |  2 +-
 test_ceph_daemon.sh               | 12 +++++++-----
 7 files changed, 14 insertions(+), 11 deletions(-)
 rename src/{ => ceph-daemon}/ceph-daemon (100%)

diff --git a/ceph.spec.in b/ceph.spec.in
index 519f0d257b5..9584d68f33d 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -1332,7 +1332,7 @@ chmod 0644 %{buildroot}%{_docdir}/ceph/sample.ceph.conf
 install -m 0644 -D COPYING %{buildroot}%{_docdir}/ceph/COPYING
 install -m 0644 -D etc/sysctl/90-ceph-osd.conf %{buildroot}%{_sysctldir}/90-ceph-osd.conf
 
-install -m 0755 src/ceph-daemon %{buildroot}%{_sbindir}/ceph-daemon
+install -m 0755 src/ceph-daemon/ceph-daemon %{buildroot}%{_sbindir}/ceph-daemon
 
 # firewall templates and /sbin/mount.ceph symlink
 %if 0%{?suse_version}
diff --git a/debian/rules b/debian/rules
index 7b1c5a356eb..bf079dabbee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -61,7 +61,7 @@ override_dh_auto_install:
 	install -D -m 644 etc/sysctl/90-ceph-osd.conf $(DESTDIR)/etc/sysctl.d/30-ceph-osd.conf
 	install -D -m 600 sudoers.d/ceph-osd-smartctl $(DESTDIR)/etc/sudoers.d/ceph-osd-smartctl
 
-	install -m 755 src/ceph-daemon $(DESTDIR)/usr/sbin/ceph-daemon
+	install -m 755 src/ceph-daemon/ceph-daemon $(DESTDIR)/usr/sbin/ceph-daemon
 
 # doc/changelog is a directory, which confuses dh_installchangelogs
 override_dh_installchangelogs:
diff --git a/doc/bootstrap.rst b/doc/bootstrap.rst
index 85bf8b2f70e..f3032c39710 100644
--- a/doc/bootstrap.rst
+++ b/doc/bootstrap.rst
@@ -19,7 +19,7 @@ your Linux distribution::
 
 or by simply downloading the standalone script manually::
 
-  curl --silent --remote-name --location https://github.com/ceph/ceph/raw/master/src/ceph-daemon
+  curl --silent --remote-name --location https://github.com/ceph/ceph/raw/master/src/ceph-daemon/ceph-daemon
   chmod +x ceph-daemon
   sudo install -m 0755 ceph-daemon /usr/sbin    # optional!
 
diff --git a/qa/standalone/test_ceph_daemon.sh b/qa/standalone/test_ceph_daemon.sh
index f281c083f82..5d8e6385aef 100755
--- a/qa/standalone/test_ceph_daemon.sh
+++ b/qa/standalone/test_ceph_daemon.sh
@@ -9,8 +9,9 @@ IMAGE_MIMIC=${IMAGE_MIMIC:-'ceph/daemon-base:latest-mimic'}
 [ -z "$SUDO" ] && SUDO=sudo
 
 if [ -z "$CEPH_DAEMON" ]; then
-    [ -x src/ceph-daemon ] && CEPH_DAEMON=src/ceph-daemon
-    [ -x ../src/ceph-daemon ] && CEPH_DAEMON=../src/ceph-daemon
+    [ -x src/ceph-daemon/ceph-daemon ] && CEPH_DAEMON=src/ceph-daemon/ceph-daemon
+    [ -x ../src/ceph-daemon/ceph-daemon ] && CEPH_DAEMON=../src/ceph-daemon/ceph-daemon
+    [ -x ./ceph-daemon/ceph-daemon ] && CEPH_DAEMON=./ceph-daemon/ceph-daemon
     [ -x ./ceph-daemon ] && CEPH_DAEMON=.ceph-daemon
     which ceph-daemon && CEPH_DAEMON=$(which ceph-daemon)
 fi
diff --git a/src/ceph-daemon b/src/ceph-daemon/ceph-daemon
similarity index 100%
rename from src/ceph-daemon
rename to src/ceph-daemon/ceph-daemon
diff --git a/src/vstart.sh b/src/vstart.sh
index 8b630110f9c..9b83a0525f4 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -697,7 +697,7 @@ $extra_conf
 [mgr]
         mgr data = $CEPH_DEV_DIR/mgr.\$id
         mgr module path = $MGR_PYTHON_PATH
-        ceph daemon path = $CEPH_ROOT/src/ceph-daemon
+        ceph daemon path = $CEPH_ROOT/src/ceph-daemon/ceph-daemon
 $DAEMONOPTS
 $extra_conf
 [osd]
diff --git a/test_ceph_daemon.sh b/test_ceph_daemon.sh
index 20af3c2788f..f17793a8b0b 100755
--- a/test_ceph_daemon.sh
+++ b/test_ceph_daemon.sh
@@ -4,16 +4,18 @@ fsid='00000000-0000-0000-0000-0000deadbeef'
 image='ceph/daemon-base:latest-master'
 [ -z "$ip" ] && ip=127.0.0.1
 
+CEPH_DAEMON=../src/ceph-daemon/ceph-daemon
+
 #A="-d"
 
-../src/ceph-daemon $A rm-cluster --fsid $fsid --force
+$CEPH_DAEMON $A rm-cluster --fsid $fsid --force
 
 cat <<EOF > c
 [global]
 log to file = true
 EOF
 
-../src/ceph-daemon $A \
+$CEPH_DAEMON $A \
     --image $image \
     bootstrap \
     --mon-id a \
@@ -27,7 +29,7 @@ chmod 644 k c
 
 if [ -n "$ip2" ]; then
     # mon.b
-    ../src/ceph-daemon $A \
+    $CEPH_DAEMON $A \
     --image $image \
     deploy --name mon.b \
     --fsid $fsid \
@@ -41,7 +43,7 @@ bin/ceph -c c -k k auth get-or-create mgr.y \
 	 mon 'allow profile mgr' \
 	 osd 'allow *' \
 	 mds 'allow *' > k-mgr.y
-../src/ceph-daemon $A \
+$CEPH_DAEMON $A \
     --image $image \
     deploy --name mgr.y \
     --fsid $fsid \
@@ -55,7 +57,7 @@ for id in k j; do
 	     mgr 'allow profile mds' \
 	     osd 'allow *' \
 	     mds 'allow *' > k-mds.$id
-    ../src/ceph-daemon $A \
+    $CEPH_DAEMON $A \
 	--image $image \
 	deploy --name mds.$id \
 	--fsid $fsid \