From c8750b706681115730929c3dbce6076210d4a195 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 11 Dec 2019 13:48:02 -0600 Subject: [PATCH] files,rpm,deb: rename ceph-daemon -> cephadm This is just renaming the files and adjusting the packages. Lots of cleanup to do still. Signed-off-by: Sage Weil --- .github/CODEOWNERS | 2 +- ceph.spec.in | 46 +++++++++---------- debian/ceph-daemon.install | 2 - debian/cephadm.install | 2 + ...{ceph-daemon.postinst => cephadm.postinst} | 30 ++++++------ debian/{ceph-daemon.postrm => cephadm.postrm} | 4 +- debian/control | 8 ++-- debian/rules | 6 +-- qa/packages/packages.yaml | 4 +- qa/standalone/test_ceph_daemon.sh | 8 ++-- .../old_client/tasks/0-mimic.yaml | 2 +- .../upgraded_client/tasks/0-mimic.yaml | 2 +- qa/suites/rados/ssh/mode/packaged.yaml | 2 +- .../thrash-old-clients/1-install/hammer.yaml | 2 +- .../1-install/jewel-v1only.yaml | 2 +- .../thrash-old-clients/1-install/jewel.yaml | 2 +- .../1-install/luminous-v1only.yaml | 2 +- .../1-install/luminous.yaml | 2 +- .../1-install/mimic-v1only.yaml | 2 +- .../thrash-old-clients/1-install/mimic.yaml | 2 +- .../1-install/nautilus-v1only.yaml | 2 +- .../1-install/nautilus-v2only.yaml | 2 +- .../1-install/nautilus.yaml | 2 +- .../mimic-x-singleton/1-install/mimic.yaml | 2 +- .../parallel/1-ceph-install/mimic.yaml | 2 +- .../stress-split/1-ceph-install/mimic.yaml | 2 +- .../1-install/nautilus.yaml | 2 +- qa/tasks/ceph2.py | 12 ++--- src/CMakeLists.txt | 2 +- src/{ceph-daemon => cephadm}/CMakeLists.txt | 2 +- .../ceph-daemon => cephadm/cephadm} | 0 src/{ceph-daemon => cephadm}/mypy.ini | 0 .../tests/__init__.py | 0 .../tests/test_ceph_daemon.py | 4 +- src/{ceph-daemon => cephadm}/tox.ini | 2 +- src/common/options.cc | 4 +- src/pybind/mgr/ssh/module.py | 8 ++-- src/vstart.sh | 2 +- sudoers.d/cephadm | 7 +++ sudoers.d/cephdaemon | 7 --- test_ceph_daemon.sh | 2 +- 41 files changed, 99 insertions(+), 99 deletions(-) delete mode 100644 debian/ceph-daemon.install create mode 100644 debian/cephadm.install rename debian/{ceph-daemon.postinst => cephadm.postinst} (61%) rename debian/{ceph-daemon.postrm => cephadm.postrm} (93%) rename src/{ceph-daemon => cephadm}/CMakeLists.txt (52%) rename src/{ceph-daemon/ceph-daemon => cephadm/cephadm} (100%) rename src/{ceph-daemon => cephadm}/mypy.ini (100%) rename src/{ceph-daemon => cephadm}/tests/__init__.py (100%) rename src/{ceph-daemon => cephadm}/tests/test_ceph_daemon.py (83%) rename src/{ceph-daemon => cephadm}/tox.ini (82%) create mode 100644 sudoers.d/cephadm delete mode 100644 sudoers.d/cephdaemon diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 685382b97ba18..51237b2330a1f 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -8,7 +8,7 @@ /doc/mgr/dashboard.rst @ceph/dashboard # For Orchestrator related PRs -/src/ceph-daemon @ceph/orchestrators +/src/cephadm @ceph/orchestrators /src/pybind/mgr/ansible @ceph/orchestrators /src/pybind/mgr/orchestrator_cli @ceph/orchestrators /src/pybind/mgr/orchestrator.py @ceph/orchestrators diff --git a/ceph.spec.in b/ceph.spec.in index 1adb2d7710861..968f25dc5375c 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -400,11 +400,11 @@ Recommends: chrony %description base Base is the package that includes all the files shared amongst ceph servers -%package -n ceph-daemon -Summary: Ceph-daemon utility to bootstrap Ceph clusters +%package -n cephadm +Summary: cephadm utility to bootstrap Ceph clusters Requires: podman -%description -n ceph-daemon -Ceph-daemon utility to bootstrap a Ceph cluster and manage ceph daemons +%description -n cephadm +cephadm utility to bootstrap a Ceph cluster and manage ceph daemons deployed with systemd and podman. %package -n ceph-common @@ -604,7 +604,7 @@ Group: System/Filesystems %endif Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release} Requires: python%{_python_buildid}-remoto -Requires: ceph-daemon = %{_epoch_prefix}%{version}-%{release} +Requires: cephadm = %{_epoch_prefix}%{version}-%{release} %if 0%{?suse_version} Requires: openssh %endif @@ -1349,7 +1349,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/ceph-daemon %{buildroot}%{_sbindir}/ceph-daemon +install -m 0755 src/cephadm/cephadm %{buildroot}%{_sbindir}/cephadm # firewall templates and /sbin/mount.ceph symlink %if 0%{?suse_version} @@ -1362,7 +1362,7 @@ install -m 0644 -D udev/50-rbd.rules %{buildroot}%{_udevrulesdir}/50-rbd.rules # sudoers.d install -m 0600 -D sudoers.d/ceph-osd-smartctl %{buildroot}%{_sysconfdir}/sudoers.d/ceph-osd-smartctl -install -m 0600 -D sudoers.d/cephdaemon %{buildroot}%{_sysconfdir}/sudoers.d/cephdaemon +install -m 0600 -D sudoers.d/cephadm %{buildroot}%{_sysconfdir}/sudoers.d/cephadm %if 0%{?rhel} >= 8 pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_bindir}/* @@ -1510,31 +1510,31 @@ if [ $1 -ge 1 ] ; then fi fi -%pre daemon +%pre -n cephadm # create user -if ! getent passwd | grep -q '^cephdaemon:'; then - useradd -r -s /bin/bash -c "Ceph-daemon user for mgr/ssh" -m cephdaemon +if ! getent passwd | grep -q '^cephadm:'; then + useradd -r -s /bin/bash -c "cephadm user for mgr/ssh" -m cephadm fi # set up (initially empty) .ssh/authorized_keys file -if ! test -d /home/cephdaemon/.ssh; then - mkdir /home/cephdaemon/.ssh - chown --reference /home/cephdaemon /home/cephdaemon/.ssh - chmod 0700 /home/cephdaemon/.ssh +if ! test -d /home/cephadm/.ssh; then + mkdir /home/cephadm/.ssh + chown --reference /home/cephadm /home/cephadm/.ssh + chmod 0700 /home/cephadm/.ssh fi -if ! test -e /home/cephdaemon/.ssh/authorized_keys; then - touch /home/cephdaemon/.ssh/authorized_keys - chown --reference /home/cephdaemon /home/cephdaemon/.ssh/authorized_keys - chmod 0600 /home/cephdaemon/.ssh/authorized_keys +if ! test -e /home/cephadm/.ssh/authorized_keys; then + touch /home/cephadm/.ssh/authorized_keys + chown --reference /home/cephadm /home/cephadm/.ssh/authorized_keys + chmod 0600 /home/cephadm/.ssh/authorized_keys fi exit 0 -%postun daemon -userdel -r cephdaemon || true +%postun -n cephadm +userdel -r cephadm || true exit 0 -%files daemon -%{_sbindir}/ceph-daemon -%{_sysconfdir}/sudoers.d/cephdaemon +%files -n cephadm +%{_sbindir}/cephadm +%{_sysconfdir}/sudoers.d/cephadm %files common %dir %{_docdir}/ceph diff --git a/debian/ceph-daemon.install b/debian/ceph-daemon.install deleted file mode 100644 index 014e78e1d6a68..0000000000000 --- a/debian/ceph-daemon.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/sbin/ceph-daemon -etc/sudoers.d/cephdaemon diff --git a/debian/cephadm.install b/debian/cephadm.install new file mode 100644 index 0000000000000..262f3eec6ab52 --- /dev/null +++ b/debian/cephadm.install @@ -0,0 +1,2 @@ +usr/sbin/cephadm +etc/sudoers.d/cephadm diff --git a/debian/ceph-daemon.postinst b/debian/cephadm.postinst similarity index 61% rename from debian/ceph-daemon.postinst rename to debian/cephadm.postinst index d0e0565297900..4b2bdf7899b2c 100644 --- a/debian/ceph-daemon.postinst +++ b/debian/cephadm.postinst @@ -1,6 +1,6 @@ #!/bin/sh # vim: set noet ts=8: -# postinst script for ceph-daemon +# postinst script for cephadm # # see: dh_installdeb(1) @@ -21,31 +21,31 @@ set -e case "$1" in configure) - # create cephdaemon user + # create cephadm user # 1. create user if not existing - if ! getent passwd | grep -q "^cephdaemon:"; then - echo -n "Adding system user cephdaemon.." - adduser --quiet --system --disabled-password --gecos 'Ceph-dameon user for mgr/ssh' --shell /bin/bash cephdaemon 2>/dev/null || true + if ! getent passwd | grep -q "^cephadm:"; then + echo -n "Adding system user cephadm.." + adduser --quiet --system --disabled-password --gecos 'Ceph-dameon user for mgr/ssh' --shell /bin/bash cephadm 2>/dev/null || true echo "..done" fi # 2. make sure user is unlocked if [ -f /etc/shadow ]; then - usermod -U -e '' cephdaemon + usermod -U -e '' cephadm else - usermod -U cephdaemon + usermod -U cephadm fi # set up (initially empty) .ssh/authorized_keys file - if ! test -d /home/cephdaemon/.ssh; then - mkdir /home/cephdaemon/.ssh - chown --reference /home/cephdaemon /home/cephdaemon/.ssh - chmod 0700 /home/cephdaemon/.ssh + if ! test -d /home/cephadm/.ssh; then + mkdir /home/cephadm/.ssh + chown --reference /home/cephadm /home/cephadm/.ssh + chmod 0700 /home/cephadm/.ssh fi - if ! test -e /home/cephdaemon/.ssh/authorized_keys; then - touch /home/cephdaemon/.ssh/authorized_keys - chown --reference /home/cephdaemon /home/cephdaemon/.ssh/authorized_keys - chmod 0600 /home/cephdaemon/.ssh/authorized_keys + if ! test -e /home/cephadm/.ssh/authorized_keys; then + touch /home/cephadm/.ssh/authorized_keys + chown --reference /home/cephadm /home/cephadm/.ssh/authorized_keys + chmod 0600 /home/cephadm/.ssh/authorized_keys fi ;; diff --git a/debian/ceph-daemon.postrm b/debian/cephadm.postrm similarity index 93% rename from debian/ceph-daemon.postrm rename to debian/cephadm.postrm index 564ffefb6a85f..379ad73e2d879 100644 --- a/debian/ceph-daemon.postrm +++ b/debian/cephadm.postrm @@ -1,5 +1,5 @@ #!/bin/sh -# postrm script for ceph-daemon +# postrm script for cephadm # # see: dh_installdeb(1) @@ -21,7 +21,7 @@ set -e case "$1" in remove) - deluser --remove-home cephdaemon + deluser --remove-home cephadm ;; purge) diff --git a/debian/control b/debian/control index 6fd1e6c3f135d..838b139fc76b6 100644 --- a/debian/control +++ b/debian/control @@ -167,16 +167,16 @@ Description: debugging symbols for ceph-base . This package contains the debugging symbols for ceph-base. -Package: ceph-daemon +Package: cephadm Architecture: linux-any Depends: docker.io, ${python:Depends}, -Description: ceph-daemon utility to bootstrap ceph daemons with systemd and containers +Description: cephadm utility to bootstrap ceph daemons with systemd and containers Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, block and file system storage. . - The ceph-daemon utility is used to bootstrap a Ceph cluster and to manage + The cephadm utility is used to bootstrap a Ceph cluster and to manage ceph daemons deployed with systemd and containers. Package: ceph-mds @@ -329,7 +329,7 @@ Description: kubernetes events plugin for ceph-mgr Package: ceph-mgr-ssh Architecture: all Depends: ceph-mgr (= ${binary:Version}), - ceph-daemon, + cephadm, python-six, ${misc:Depends}, ${python:Depends}, diff --git a/debian/rules b/debian/rules index be3959c5313fe..be6b1539cd01e 100755 --- a/debian/rules +++ b/debian/rules @@ -60,9 +60,9 @@ override_dh_auto_install: install -D -m 644 src/etc-rbdmap $(DESTDIR)/etc/ceph/rbdmap 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 -D -m 600 sudoers.d/cephdaemon $(DESTDIR)/etc/sudoers.d/cephdaemon + install -D -m 600 sudoers.d/cephadm $(DESTDIR)/etc/sudoers.d/cephadm - install -m 755 src/ceph-daemon/ceph-daemon $(DESTDIR)/usr/sbin/ceph-daemon + install -m 755 src/cephadm/cephadm $(DESTDIR)/usr/sbin/cephadm # doc/changelog is a directory, which confuses dh_installchangelogs override_dh_installchangelogs: @@ -135,7 +135,7 @@ override_dh_python2: dh_python2 -p ceph-mgr # batch-compile, and set up for delete, all the module files dh_python2 -p ceph-mgr usr/lib/ceph/mgr - dh_python2 -p ceph-daemon + dh_python2 -p cephadm override_dh_python3: for binding in rados cephfs rbd rgw; do \ diff --git a/qa/packages/packages.yaml b/qa/packages/packages.yaml index c8a099098fd89..c545563e12daa 100644 --- a/qa/packages/packages.yaml +++ b/qa/packages/packages.yaml @@ -2,7 +2,7 @@ ceph: deb: - ceph - - ceph-daemon + - cephadm - ceph-mds - ceph-mgr - ceph-common @@ -35,7 +35,7 @@ ceph: - ceph-radosgw - ceph-test - ceph - - ceph-daemon + - cephadm - ceph-mgr - ceph-mgr-dashboard - ceph-mgr-diskprediction-cloud diff --git a/qa/standalone/test_ceph_daemon.sh b/qa/standalone/test_ceph_daemon.sh index 1bb94f20c11dd..12d8c10eb338d 100755 --- a/qa/standalone/test_ceph_daemon.sh +++ b/qa/standalone/test_ceph_daemon.sh @@ -27,12 +27,12 @@ OSD_LV_NAME=${SCRIPT_NAME%.*} [ -z "$SUDO" ] && SUDO=sudo if [ -z "$CEPH_DAEMON" ]; then - CEPH_DAEMON=${SCRIPT_DIR}/../../src/ceph-daemon/ceph-daemon + CEPH_DAEMON=${SCRIPT_DIR}/../../src/cephadm/cephadm fi # at this point, we need $CEPH_DAEMON set if ! [ -x "$CEPH_DAEMON" ]; then - echo "ceph-daemon not found. Please set \$CEPH_DAEMON" + echo "cephadm not found. Please set \$CEPH_DAEMON" exit 1 fi @@ -42,7 +42,7 @@ if [ -z "$PYTHON_KLUDGE" ]; then TMPBINDIR=$(mktemp -d) trap "rm -rf $TMPBINDIR" EXIT ORIG_CEPH_DAEMON="$CEPH_DAEMON" - CEPH_DAEMON="$TMPBINDIR/ceph-daemon" + CEPH_DAEMON="$TMPBINDIR/cephadm" for p in $PYTHONS; do echo "=== re-running with $p ===" ln -s `which $p` $TMPBINDIR/python @@ -211,7 +211,7 @@ for tarball in $TEST_TARS; do # validate after adopt out=$($CEPH_DAEMON ls | jq '.[]' \ | jq 'select(.name == "'$name'")') - echo $out | jq -r '.style' | grep 'ceph-daemon' + echo $out | jq -r '.style' | grep 'cephadm' echo $out | jq -r '.fsid' | grep $FSID_LEGACY done # clean-up before next iter diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-mimic.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-mimic.yaml index c285e4604c63a..a102c5ae5e28e 100644 --- a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-mimic.yaml +++ b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-mimic.yaml @@ -11,7 +11,7 @@ tasks: - ceph-mgr-diskprediction-cloud - ceph-mgr-rook - ceph-mgr-ssh - - ceph-daemon + - cephadm extra_packages: ['librados2'] - print: "**** done installing mimic" - ceph: diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-mimic.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-mimic.yaml index c285e4604c63a..a102c5ae5e28e 100644 --- a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-mimic.yaml +++ b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-mimic.yaml @@ -11,7 +11,7 @@ tasks: - ceph-mgr-diskprediction-cloud - ceph-mgr-rook - ceph-mgr-ssh - - ceph-daemon + - cephadm extra_packages: ['librados2'] - print: "**** done installing mimic" - ceph: diff --git a/qa/suites/rados/ssh/mode/packaged.yaml b/qa/suites/rados/ssh/mode/packaged.yaml index 98f41f02322a3..35b26857dd4c4 100644 --- a/qa/suites/rados/ssh/mode/packaged.yaml +++ b/qa/suites/rados/ssh/mode/packaged.yaml @@ -2,4 +2,4 @@ overrides: ceph2: ceph_daemon_mode: packaged-ceph-daemon install: - extra_packages: [ceph-daemon] + extra_packages: [cephadm] diff --git a/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml b/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml index 804a46e77322e..d137fddcc4932 100644 --- a/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml +++ b/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml @@ -21,7 +21,7 @@ tasks: - ceph-mgr-diskprediction-cloud - ceph-mgr-rook - ceph-mgr-ssh - - ceph-daemon + - cephadm - ceph-mgr - libcephfs2 - libcephfs-devel diff --git a/qa/suites/rados/thrash-old-clients/1-install/jewel-v1only.yaml b/qa/suites/rados/thrash-old-clients/1-install/jewel-v1only.yaml index 34935d967bf9a..ded6183bd684b 100644 --- a/qa/suites/rados/thrash-old-clients/1-install/jewel-v1only.yaml +++ b/qa/suites/rados/thrash-old-clients/1-install/jewel-v1only.yaml @@ -18,7 +18,7 @@ tasks: - ceph-mgr-diskprediction-cloud - ceph-mgr-rook - ceph-mgr-ssh - - ceph-daemon + - cephadm - ceph-mgr - libcephfs2 - libcephfs-devel diff --git a/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml b/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml index a61c87d258b91..d8e0f7f2daf12 100644 --- a/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml +++ b/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml @@ -17,7 +17,7 @@ tasks: - ceph-mgr-diskprediction-cloud - ceph-mgr-rook - ceph-mgr-ssh - - ceph-daemon + - cephadm - ceph-mgr - libcephfs2 - libcephfs-devel diff --git a/qa/suites/rados/thrash-old-clients/1-install/luminous-v1only.yaml b/qa/suites/rados/thrash-old-clients/1-install/luminous-v1only.yaml index 9784952cabb2c..1ebe7af9c1466 100644 --- a/qa/suites/rados/thrash-old-clients/1-install/luminous-v1only.yaml +++ b/qa/suites/rados/thrash-old-clients/1-install/luminous-v1only.yaml @@ -18,7 +18,7 @@ tasks: - ceph-mgr-diskprediction-cloud - ceph-mgr-rook - ceph-mgr-ssh - - ceph-daemon + - cephadm extra_packages: ['librados2'] - install.upgrade: mon.a: diff --git a/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml b/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml index 8f9d34d0b4565..ccd3c06a31afc 100644 --- a/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml +++ b/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml @@ -17,7 +17,7 @@ tasks: - ceph-mgr-diskprediction-cloud - ceph-mgr-rook - ceph-mgr-ssh - - ceph-daemon + - cephadm extra_packages: ['librados2'] - install.upgrade: mon.a: diff --git a/qa/suites/rados/thrash-old-clients/1-install/mimic-v1only.yaml b/qa/suites/rados/thrash-old-clients/1-install/mimic-v1only.yaml index 34786ef784fac..4c503f42fe299 100644 --- a/qa/suites/rados/thrash-old-clients/1-install/mimic-v1only.yaml +++ b/qa/suites/rados/thrash-old-clients/1-install/mimic-v1only.yaml @@ -18,7 +18,7 @@ tasks: - ceph-mgr-diskprediction-cloud - ceph-mgr-rook - ceph-mgr-ssh - - ceph-daemon + - cephadm extra_packages: ['librados2'] - install.upgrade: mon.a: diff --git a/qa/suites/rados/thrash-old-clients/1-install/mimic.yaml b/qa/suites/rados/thrash-old-clients/1-install/mimic.yaml index bdb6b62185576..20d4e00e21374 100644 --- a/qa/suites/rados/thrash-old-clients/1-install/mimic.yaml +++ b/qa/suites/rados/thrash-old-clients/1-install/mimic.yaml @@ -18,7 +18,7 @@ tasks: - ceph-mgr-diskprediction-cloud - ceph-mgr-rook - ceph-mgr-ssh - - ceph-daemon + - cephadm extra_packages: ['librados2'] - install.upgrade: mon.a: diff --git a/qa/suites/rados/thrash-old-clients/1-install/nautilus-v1only.yaml b/qa/suites/rados/thrash-old-clients/1-install/nautilus-v1only.yaml index 30e2ba2da5255..3ef5ec0366b39 100644 --- a/qa/suites/rados/thrash-old-clients/1-install/nautilus-v1only.yaml +++ b/qa/suites/rados/thrash-old-clients/1-install/nautilus-v1only.yaml @@ -12,7 +12,7 @@ tasks: - install: branch: nautilus exclude_packages: - - ceph-daemon + - cephadm - install.upgrade: mon.a: mon.b: diff --git a/qa/suites/rados/thrash-old-clients/1-install/nautilus-v2only.yaml b/qa/suites/rados/thrash-old-clients/1-install/nautilus-v2only.yaml index 4db075e79c129..4077e07d01b0c 100644 --- a/qa/suites/rados/thrash-old-clients/1-install/nautilus-v2only.yaml +++ b/qa/suites/rados/thrash-old-clients/1-install/nautilus-v2only.yaml @@ -11,7 +11,7 @@ tasks: - install: branch: nautilus exclude_packages: - - ceph-daemon + - cephadm - install.upgrade: mon.a: mon.b: diff --git a/qa/suites/rados/thrash-old-clients/1-install/nautilus.yaml b/qa/suites/rados/thrash-old-clients/1-install/nautilus.yaml index 3d2691a7b1ddc..ed38c9c900381 100644 --- a/qa/suites/rados/thrash-old-clients/1-install/nautilus.yaml +++ b/qa/suites/rados/thrash-old-clients/1-install/nautilus.yaml @@ -6,7 +6,7 @@ tasks: - install: branch: nautilus exclude_packages: - - ceph-daemon + - cephadm - install.upgrade: mon.a: mon.b: diff --git a/qa/suites/upgrade/mimic-x-singleton/1-install/mimic.yaml b/qa/suites/upgrade/mimic-x-singleton/1-install/mimic.yaml index 02ac0468e23e4..7d0040c3ecf27 100644 --- a/qa/suites/upgrade/mimic-x-singleton/1-install/mimic.yaml +++ b/qa/suites/upgrade/mimic-x-singleton/1-install/mimic.yaml @@ -16,7 +16,7 @@ tasks: - ceph-mgr-diskprediction-cloud - ceph-mgr-rook - ceph-mgr-ssh - - ceph-daemon + - cephadm extra_packages: ['librados2'] - print: "**** done install mimic" - ceph: diff --git a/qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml b/qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml index e4ca466baeb0c..bed8225377293 100644 --- a/qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml +++ b/qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml @@ -13,7 +13,7 @@ tasks: - ceph-mgr-diskprediction-cloud - ceph-mgr-rook - ceph-mgr-ssh - - ceph-daemon + - cephadm extra_packages: ['librados2'] - print: "**** done installing mimic" - ceph: diff --git a/qa/suites/upgrade/mimic-x/stress-split/1-ceph-install/mimic.yaml b/qa/suites/upgrade/mimic-x/stress-split/1-ceph-install/mimic.yaml index 6c4fe67e8fe68..835a20fdb7460 100644 --- a/qa/suites/upgrade/mimic-x/stress-split/1-ceph-install/mimic.yaml +++ b/qa/suites/upgrade/mimic-x/stress-split/1-ceph-install/mimic.yaml @@ -10,7 +10,7 @@ tasks: - ceph-mgr-diskprediction-cloud - ceph-mgr-rook - ceph-mgr-ssh - - ceph-daemon + - cephadm extra_packages: ['librados2'] - print: "**** done install mimic" - ceph: diff --git a/qa/suites/upgrade/nautilus-x-singleton/1-install/nautilus.yaml b/qa/suites/upgrade/nautilus-x-singleton/1-install/nautilus.yaml index e56c437e0a1c1..064c2203cfd39 100644 --- a/qa/suites/upgrade/nautilus-x-singleton/1-install/nautilus.yaml +++ b/qa/suites/upgrade/nautilus-x-singleton/1-install/nautilus.yaml @@ -16,7 +16,7 @@ tasks: - ceph-mgr-diskprediction-cloud - ceph-mgr-rook - ceph-mgr-ssh - - ceph-daemon + - cephadm extra_packages: ['librados2'] - print: "**** done install nautilus" - ceph: diff --git a/qa/tasks/ceph2.py b/qa/tasks/ceph2.py index c9ef661c0dc94..27b291ca38bf7 100644 --- a/qa/tasks/ceph2.py +++ b/qa/tasks/ceph2.py @@ -98,15 +98,15 @@ def download_ceph_daemon(ctx, config, ref): if config.get('ceph_daemon_mode') != 'packaged-ceph-daemon': ref = config.get('ceph_daemon_branch', ref) git_url = teuth_config.get_ceph_git_url() - log.info('Downloading ceph-daemon (repo %s ref %s)...' % (git_url, ref)) + log.info('Downloading cephadm (repo %s ref %s)...' % (git_url, ref)) ctx.cluster.run( args=[ 'git', 'archive', '--remote=' + git_url, ref, - 'src/ceph-daemon/ceph-daemon', + 'src/cephadm/cephadm', run.Raw('|'), - 'tar', '-xO', 'src/ceph-daemon/ceph-daemon', + 'tar', '-xO', 'src/cephadm/cephadm', run.Raw('>'), ctx.ceph_daemon, run.Raw('&&'), @@ -131,7 +131,7 @@ def download_ceph_daemon(ctx, config, ref): ]) if config.get('ceph_daemon_mode') == 'root': - log.info('Removing ceph-daemon ...') + log.info('Removing cephadm ...') ctx.cluster.run( args=[ 'rm', @@ -784,9 +784,9 @@ def task(ctx, config): config['ceph_daemon_mode'] = 'root' assert config['ceph_daemon_mode'] in ['root', 'packaged-ceph-daemon'] if config['ceph_daemon_mode'] == 'root': - ctx.ceph_daemon = testdir + '/ceph-daemon' + ctx.ceph_daemon = testdir + '/cephadm' else: - ctx.ceph_daemon = 'ceph-daemon' # in the path + ctx.ceph_daemon = 'cephadm' # in the path if first_ceph_cluster: # FIXME: this is global for all clusters diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8b363766b9076..08c9b094c7057 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -509,7 +509,7 @@ endif() add_subdirectory(pybind) add_subdirectory(ceph-volume) add_subdirectory(python-common) -add_subdirectory(ceph-daemon) +add_subdirectory(cephadm) # Monitor add_subdirectory(mon) diff --git a/src/ceph-daemon/CMakeLists.txt b/src/cephadm/CMakeLists.txt similarity index 52% rename from src/ceph-daemon/CMakeLists.txt rename to src/cephadm/CMakeLists.txt index a83105b2a99cf..998776f0eb212 100644 --- a/src/ceph-daemon/CMakeLists.txt +++ b/src/cephadm/CMakeLists.txt @@ -1,4 +1,4 @@ if(WITH_TESTS) include(AddCephTest) - add_tox_test(ceph-daemon TOX_ENVS mypy) + add_tox_test(cephadm TOX_ENVS mypy) endif() diff --git a/src/ceph-daemon/ceph-daemon b/src/cephadm/cephadm similarity index 100% rename from src/ceph-daemon/ceph-daemon rename to src/cephadm/cephadm diff --git a/src/ceph-daemon/mypy.ini b/src/cephadm/mypy.ini similarity index 100% rename from src/ceph-daemon/mypy.ini rename to src/cephadm/mypy.ini diff --git a/src/ceph-daemon/tests/__init__.py b/src/cephadm/tests/__init__.py similarity index 100% rename from src/ceph-daemon/tests/__init__.py rename to src/cephadm/tests/__init__.py diff --git a/src/ceph-daemon/tests/test_ceph_daemon.py b/src/cephadm/tests/test_ceph_daemon.py similarity index 83% rename from src/ceph-daemon/tests/test_ceph_daemon.py rename to src/cephadm/tests/test_ceph_daemon.py index 8425c78d6808f..ada2beff714da 100644 --- a/src/ceph-daemon/tests/test_ceph_daemon.py +++ b/src/cephadm/tests/test_ceph_daemon.py @@ -5,10 +5,10 @@ import unittest if sys.version_info >= (3, 3): from importlib.machinery import SourceFileLoader - cd = SourceFileLoader('ceph-daemon', 'ceph-daemon').load_module() + cd = SourceFileLoader('cephadm', 'cephadm').load_module() else: import imp - cd = imp.load_source('ceph-daemon', 'ceph-daemon') + cd = imp.load_source('cephadm', 'cephadm') class TestCephDaemon(unittest.TestCase): def test_is_fsid(self): diff --git a/src/ceph-daemon/tox.ini b/src/cephadm/tox.ini similarity index 82% rename from src/ceph-daemon/tox.ini rename to src/cephadm/tox.ini index 7407aac9c8994..66edfe99f2ac2 100644 --- a/src/ceph-daemon/tox.ini +++ b/src/cephadm/tox.ini @@ -12,4 +12,4 @@ commands=pytest {posargs} [testenv:mypy] basepython = python3 deps = mypy -commands = mypy {posargs:ceph-daemon} \ No newline at end of file +commands = mypy {posargs:cephadm} diff --git a/src/common/options.cc b/src/common/options.cc index e4e4c7dd21c6f..a6918ab3a58a2 100644 --- a/src/common/options.cc +++ b/src/common/options.cc @@ -5112,9 +5112,9 @@ std::vector