RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-22 18:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

ceph-daemon: Move ceph-daemon executable to own directory

Browse Source 
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>
This commit is contained in:
Thomas Bechtold 2019-11-07 16:41:23 +01:00
parent 457b9560a3
commit 4258c4772a
7 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceph.spec.in
View File

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

2
debian/rules vendored
View File

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

2
doc/bootstrap.rst
View File

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

5
qa/standalone/test_ceph_daemon.sh
View File

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

0
src/ceph-daemon → src/ceph-daemon/ceph-daemon
View File

2
src/vstart.sh
View File

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

12
test_ceph_daemon.sh
View File

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