From cd1c05acbbe672dd21ac132f81fe63e466e2286f Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 11 Dec 2019 15:35:02 -0600 Subject: [PATCH] mgr/ssh -> mgr/cephadm Signed-off-by: Sage Weil --- .github/CODEOWNERS | 4 +- ceph.spec.in | 26 +-- debian/ceph-mgr-cephadm.install | 1 + ...ssh.postinst => ceph-mgr-cephadm.postinst} | 4 +- ...h-mgr-ssh.prerm => ceph-mgr-cephadm.prerm} | 0 debian/ceph-mgr-ssh.install | 1 - debian/cephadm.postinst | 2 +- debian/control | 12 +- doc/mgr/{ssh.rst => cephadm.rst} | 18 +- doc/mgr/index.rst | 4 +- qa/packages/packages.yaml | 2 +- qa/suites/rados/{ssh => cephadm}/% | 0 qa/suites/rados/{ssh => cephadm}/.qa | 0 qa/suites/rados/{ssh => cephadm}/fixed-2.yaml | 0 .../rados/{ssh => cephadm}/mode/packaged.yaml | 0 .../rados/{ssh => cephadm}/mode/root.yaml | 0 qa/suites/rados/{ssh => cephadm}/msgr | 0 qa/suites/rados/{ssh => cephadm}/start.yaml | 0 .../{ssh => cephadm}/supported-random-distro$ | 0 .../tasks/rados_api_tests.yaml | 0 .../{ssh => cephadm}/tasks/rados_python.yaml | 0 ...strator.yaml => cephadm_orchestrator.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 +- .../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 +- ...trator.py => test_cephadm_orchestrator.py} | 4 +- src/cephadm/cephadm | 10 +- src/common/options.cc | 2 +- src/mon/MonCap.cc | 2 +- src/pybind/mgr/{ssh => cephadm}/.gitignore | 0 src/pybind/mgr/{ssh => cephadm}/HACKING.rst | 16 +- src/pybind/mgr/{ssh => cephadm}/Vagrantfile | 0 src/pybind/mgr/{ssh => cephadm}/__init__.py | 2 +- src/pybind/mgr/{ssh => cephadm}/ceph.repo | 0 src/pybind/mgr/{ssh => cephadm}/module.py | 38 ++-- src/pybind/mgr/{ssh => cephadm}/remotes.py | 0 .../mgr/{ssh => cephadm}/tests/__init__.py | 0 src/pybind/mgr/cephadm/tests/fixtures.py | 46 +++++ src/pybind/mgr/cephadm/tests/test_cephadm.py | 174 +++++++++++++++++ .../{ssh => cephadm}/tests/test_completion.py | 51 +++-- src/pybind/mgr/orchestrator_cli/module.py | 2 +- src/pybind/mgr/ssh/tests/fixtures.py | 46 ----- src/pybind/mgr/ssh/tests/test_ssh.py | 176 ------------------ src/pybind/mgr/tox.ini | 4 +- ...rchestrator.py => cephadm_orchestrator.py} | 0 src/vstart.sh | 16 +- 54 files changed, 341 insertions(+), 346 deletions(-) create mode 100644 debian/ceph-mgr-cephadm.install rename debian/{ceph-mgr-ssh.postinst => ceph-mgr-cephadm.postinst} (96%) rename debian/{ceph-mgr-ssh.prerm => ceph-mgr-cephadm.prerm} (100%) delete mode 100644 debian/ceph-mgr-ssh.install rename doc/mgr/{ssh.rst => cephadm.rst} (58%) rename qa/suites/rados/{ssh => cephadm}/% (100%) rename qa/suites/rados/{ssh => cephadm}/.qa (100%) rename qa/suites/rados/{ssh => cephadm}/fixed-2.yaml (100%) rename qa/suites/rados/{ssh => cephadm}/mode/packaged.yaml (100%) rename qa/suites/rados/{ssh => cephadm}/mode/root.yaml (100%) rename qa/suites/rados/{ssh => cephadm}/msgr (100%) rename qa/suites/rados/{ssh => cephadm}/start.yaml (100%) rename qa/suites/rados/{ssh => cephadm}/supported-random-distro$ (100%) rename qa/suites/rados/{ssh => cephadm}/tasks/rados_api_tests.yaml (100%) rename qa/suites/rados/{ssh => cephadm}/tasks/rados_python.yaml (100%) rename qa/suites/rados/mgr/tasks/{ssh_orchestrator.yaml => cephadm_orchestrator.yaml} (90%) rename qa/tasks/mgr/{test_ssh_orchestrator.py => test_cephadm_orchestrator.py} (89%) rename src/pybind/mgr/{ssh => cephadm}/.gitignore (100%) rename src/pybind/mgr/{ssh => cephadm}/HACKING.rst (90%) rename src/pybind/mgr/{ssh => cephadm}/Vagrantfile (100%) rename src/pybind/mgr/{ssh => cephadm}/__init__.py (59%) rename src/pybind/mgr/{ssh => cephadm}/ceph.repo (100%) rename src/pybind/mgr/{ssh => cephadm}/module.py (98%) rename src/pybind/mgr/{ssh => cephadm}/remotes.py (100%) rename src/pybind/mgr/{ssh => cephadm}/tests/__init__.py (100%) create mode 100644 src/pybind/mgr/cephadm/tests/fixtures.py create mode 100644 src/pybind/mgr/cephadm/tests/test_cephadm.py rename src/pybind/mgr/{ssh => cephadm}/tests/test_completion.py (73%) delete mode 100644 src/pybind/mgr/ssh/tests/fixtures.py delete mode 100644 src/pybind/mgr/ssh/tests/test_ssh.py rename src/python-common/ceph/deployment/{ssh_orchestrator.py => cephadm_orchestrator.py} (100%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 65bed6376fb..493b1fc4c97 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -13,13 +13,13 @@ /src/pybind/mgr/orchestrator_cli @ceph/orchestrators /src/pybind/mgr/orchestrator.py @ceph/orchestrators /src/pybind/mgr/rook @ceph/orchestrators -/src/pybind/mgr/ssh @ceph/orchestrators +/src/pybind/mgr/cephadm @ceph/orchestrators /src/pybind/mgr/test_orchestrator @ceph/orchestrators /src/python-common/ceph/deployment @ceph/orchestrators /qa/workunits/cephadm/test_cephadm.sh @ceph/orchestrators /qa/tasks/ceph2.py @ceph/orchestrators /qa/tasks/mgr/test_orchestrator_cli.py @ceph/orchestrators -/qa/tasks/mgr/test_ssh_orchestrator.py @ceph/orchestrators +/qa/tasks/mgr/test_cephadm_orchestrator.py @ceph/orchestrators /doc/mgr/orchestrator_cli.rst @ceph/orchestrators /doc/mgr/orchestrator_modules.rst @ceph/orchestrators diff --git a/ceph.spec.in b/ceph.spec.in index 968f25dc537..423fd9e40a5 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -486,7 +486,7 @@ Recommends: ceph-mgr-diskprediction-local = %{_epoch_prefix}%{version}-%{release Recommends: ceph-mgr-diskprediction-cloud = %{_epoch_prefix}%{version}-%{release} Recommends: ceph-mgr-rook = %{_epoch_prefix}%{version}-%{release} Recommends: ceph-mgr-k8sevents = %{_epoch_prefix}%{version}-%{release} -Recommends: ceph-mgr-ssh = %{_epoch_prefix}%{version}-%{release} +Recommends: ceph-mgr-cephadm = %{_epoch_prefix}%{version}-%{release} Recommends: python%{_python_buildid}-influxdb %endif %if 0%{?rhel} == 7 @@ -596,8 +596,8 @@ Requires: python%{_python_buildid}-PyYAML ceph-mgr-k8sevents is a ceph-mgr plugin that sends every ceph-events to kubernetes' events API -%package mgr-ssh -Summary: Ceph Manager plugin for SSH-based orchestration +%package mgr-cephadm +Summary: Ceph Manager plugin for cephadm-based orchestration BuildArch: noarch %if 0%{?suse_version} Group: System/Filesystems @@ -611,9 +611,9 @@ Requires: openssh %if 0%{?rhel} || 0%{?fedora} Requires: openssh-clients %endif -%description mgr-ssh -ceph-mgr-ssh is a ceph-mgr module for orchestration functions using -direct SSH connections for management operations. +%description mgr-cephadm +ceph-mgr-cephadm is a ceph-mgr module for orchestration functions using +the integrated cephadm deployment tool management operations. %package fuse Summary: Ceph fuse-based client @@ -1040,7 +1040,7 @@ Group: Development/Libraries/Python %{?python_provide:%python_provide python-ceph-common} %description -n python-ceph-common This package contains data structures, classes and functions used by Ceph. -It also contains utilities used for the SSH orchestrator. +It also contains utilities used for the cephadm orchestrator. %endif %package -n python%{python3_pkgversion}-ceph-common @@ -1051,7 +1051,7 @@ Group: Development/Libraries/Python %{?python_provide:%python_provide python%{python3_pkgversion}-ceph-common} %description -n python%{python3_pkgversion}-ceph-common This package contains data structures, classes and functions used by Ceph. -It also contains utilities used for the SSH orchestrator. +It also contains utilities used for the cephadm orchestrator. %if 0%{with cephfs_shell} %package -n cephfs-shell @@ -1513,7 +1513,7 @@ fi %pre -n cephadm # create user if ! getent passwd | grep -q '^cephadm:'; then - useradd -r -s /bin/bash -c "cephadm user for mgr/ssh" -m cephadm + useradd -r -s /bin/bash -c "cephadm user for mgr/cephadm" -m cephadm fi # set up (initially empty) .ssh/authorized_keys file if ! test -d /home/cephadm/.ssh; then @@ -1819,15 +1819,15 @@ if [ $1 -eq 1 ] ; then /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || : fi -%files mgr-ssh -%{_datadir}/ceph/mgr/ssh +%files mgr-cephadm +%{_datadir}/ceph/mgr/cephadm -%post mgr-ssh +%post mgr-cephadm if [ $1 -eq 1 ] ; then /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || : fi -%postun mgr-ssh +%postun mgr-cephadm if [ $1 -eq 1 ] ; then /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || : fi diff --git a/debian/ceph-mgr-cephadm.install b/debian/ceph-mgr-cephadm.install new file mode 100644 index 00000000000..8dcbda16540 --- /dev/null +++ b/debian/ceph-mgr-cephadm.install @@ -0,0 +1 @@ +usr/share/ceph/mgr/cephadm diff --git a/debian/ceph-mgr-ssh.postinst b/debian/ceph-mgr-cephadm.postinst similarity index 96% rename from debian/ceph-mgr-ssh.postinst rename to debian/ceph-mgr-cephadm.postinst index c0e3b13c5b1..a69aaec0e80 100644 --- a/debian/ceph-mgr-ssh.postinst +++ b/debian/ceph-mgr-cephadm.postinst @@ -1,6 +1,6 @@ #!/bin/sh # vim: set noet ts=8: -# postinst script for ceph-mgr-ssh +# postinst script for ceph-mgr-cephadm # # see: dh_installdeb(1) @@ -39,5 +39,3 @@ esac #DEBHELPER# exit 0 - - diff --git a/debian/ceph-mgr-ssh.prerm b/debian/ceph-mgr-cephadm.prerm similarity index 100% rename from debian/ceph-mgr-ssh.prerm rename to debian/ceph-mgr-cephadm.prerm diff --git a/debian/ceph-mgr-ssh.install b/debian/ceph-mgr-ssh.install deleted file mode 100644 index 4023e4ead43..00000000000 --- a/debian/ceph-mgr-ssh.install +++ /dev/null @@ -1 +0,0 @@ -usr/share/ceph/mgr/ssh diff --git a/debian/cephadm.postinst b/debian/cephadm.postinst index 4b2bdf7899b..e84b9e1f62d 100644 --- a/debian/cephadm.postinst +++ b/debian/cephadm.postinst @@ -25,7 +25,7 @@ case "$1" in # 1. create user if not existing 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 + adduser --quiet --system --disabled-password --gecos 'Ceph-dameon user for cephadm' --shell /bin/bash cephadm 2>/dev/null || true echo "..done" fi diff --git a/debian/control b/debian/control index 838b139fc76..d252ff60d61 100644 --- a/debian/control +++ b/debian/control @@ -227,7 +227,7 @@ Recommends: ceph-mgr-dashboard, ceph-mgr-diskprediction-cloud, ceph-mgr-rook, ceph-mgr-k8sevents, - ceph-mgr-ssh + ceph-mgr-cephadm Suggests: python-influxdb Replaces: ceph (<< 0.93-417), Breaks: ceph (<< 0.93-417), @@ -326,7 +326,7 @@ Description: kubernetes events plugin for ceph-mgr ceph related events to the kubernetes events API, and track all events that occur within the rook-ceph namespace. -Package: ceph-mgr-ssh +Package: ceph-mgr-cephadm Architecture: all Depends: ceph-mgr (= ${binary:Version}), cephadm, @@ -334,12 +334,12 @@ Depends: ceph-mgr (= ${binary:Version}), ${misc:Depends}, ${python:Depends}, openssh-client -Description: ssh orchestrator plugin for ceph-mgr +Description: cephadm orchestrator plugin for ceph-mgr Ceph is a massively scalable, open-source, distributed storage system that runs on commodity hardware and delivers object, block and file system storage. . - This package contains the SSH plugin for ceph-mgr's orchestration + This package contains the CEPHADM plugin for ceph-mgr's orchestration functionality, to allow ceph-mgr to perform orchestration functions over a standard SSH connection. @@ -1249,7 +1249,7 @@ Description: Python 2 utility libraries for Ceph block and file system storage. . This package contains data structures, classes and functions used by Ceph. - It also contains utilities used for the SSH orchestrator. + It also contains utilities used for the cephadm orchestrator. Package: python3-ceph-common Architecture: all @@ -1262,7 +1262,7 @@ Description: Python 3 utility libraries for Ceph block and file system storage. . This package contains data structures, classes and functions used by Ceph. - It also contains utilities used for the SSH orchestrator. + It also contains utilities used for the cephadm orchestrator. Package: libcephfs-java Section: java diff --git a/doc/mgr/ssh.rst b/doc/mgr/cephadm.rst similarity index 58% rename from doc/mgr/ssh.rst rename to doc/mgr/cephadm.rst index 1b904061451..1d5266b9d0b 100644 --- a/doc/mgr/ssh.rst +++ b/doc/mgr/cephadm.rst @@ -1,13 +1,13 @@ -================ -SSH orchestrator -================ +==================== +cephadm orchestrator +==================== -The SSH orchestrator is an orchestrator module that does not rely on a separate +The cephadm orchestrator is an orchestrator module that does not rely on a separate system such as Rook or Ansible, but rather manages nodes in a cluster by establishing an SSH connection and issuing explicit management commands. Orchestrator modules only provide services to other modules, which in turn -provide user interfaces. To try out the SSH module, you might like +provide user interfaces. To try out the cephadm module, you might like to use the :ref:`Orchestrator CLI ` module. Requirements @@ -18,22 +18,22 @@ Requirements Configuration ------------- -The SSH orchestrator can be configured to use an SSH configuration file. This is +The cephadm orchestrator can be configured to use an SSH configuration file. This is useful for specifying private keys and other SSH connection options. :: - # ceph config set mgr mgr/ssh/ssh_config_file /path/to/config + # ceph config set mgr mgr/cephadm/ssh_config_file /path/to/config An SSH configuration file can be provided without requiring an accessible file system path as the method above does. :: - # ceph ssh set-ssh-config -i /path/to/config + # ceph cephadm set-ssh-config -i /path/to/config To clear this value use the command: :: - # ceph ssh clear-ssh-config + # ceph cephadm clear-ssh-config diff --git a/doc/mgr/index.rst b/doc/mgr/index.rst index 6b377d1bd01..5fbec8554ae 100644 --- a/doc/mgr/index.rst +++ b/doc/mgr/index.rst @@ -41,9 +41,9 @@ sensible. Telemetry module Iostat module Crash module + Insights module Orchestrator CLI module + Cephadm orchestrator Rook module DeepSea module - Insights module Ansible module - SSH orchestrator diff --git a/qa/packages/packages.yaml b/qa/packages/packages.yaml index c545563e12d..314a0ac0114 100644 --- a/qa/packages/packages.yaml +++ b/qa/packages/packages.yaml @@ -41,7 +41,7 @@ ceph: - ceph-mgr-diskprediction-cloud - ceph-mgr-diskprediction-local - ceph-mgr-rook - - ceph-mgr-ssh + - ceph-mgr-cephadm - ceph-fuse - libcephfs2 - libcephfs-devel diff --git a/qa/suites/rados/ssh/% b/qa/suites/rados/cephadm/% similarity index 100% rename from qa/suites/rados/ssh/% rename to qa/suites/rados/cephadm/% diff --git a/qa/suites/rados/ssh/.qa b/qa/suites/rados/cephadm/.qa similarity index 100% rename from qa/suites/rados/ssh/.qa rename to qa/suites/rados/cephadm/.qa diff --git a/qa/suites/rados/ssh/fixed-2.yaml b/qa/suites/rados/cephadm/fixed-2.yaml similarity index 100% rename from qa/suites/rados/ssh/fixed-2.yaml rename to qa/suites/rados/cephadm/fixed-2.yaml diff --git a/qa/suites/rados/ssh/mode/packaged.yaml b/qa/suites/rados/cephadm/mode/packaged.yaml similarity index 100% rename from qa/suites/rados/ssh/mode/packaged.yaml rename to qa/suites/rados/cephadm/mode/packaged.yaml diff --git a/qa/suites/rados/ssh/mode/root.yaml b/qa/suites/rados/cephadm/mode/root.yaml similarity index 100% rename from qa/suites/rados/ssh/mode/root.yaml rename to qa/suites/rados/cephadm/mode/root.yaml diff --git a/qa/suites/rados/ssh/msgr b/qa/suites/rados/cephadm/msgr similarity index 100% rename from qa/suites/rados/ssh/msgr rename to qa/suites/rados/cephadm/msgr diff --git a/qa/suites/rados/ssh/start.yaml b/qa/suites/rados/cephadm/start.yaml similarity index 100% rename from qa/suites/rados/ssh/start.yaml rename to qa/suites/rados/cephadm/start.yaml diff --git a/qa/suites/rados/ssh/supported-random-distro$ b/qa/suites/rados/cephadm/supported-random-distro$ similarity index 100% rename from qa/suites/rados/ssh/supported-random-distro$ rename to qa/suites/rados/cephadm/supported-random-distro$ diff --git a/qa/suites/rados/ssh/tasks/rados_api_tests.yaml b/qa/suites/rados/cephadm/tasks/rados_api_tests.yaml similarity index 100% rename from qa/suites/rados/ssh/tasks/rados_api_tests.yaml rename to qa/suites/rados/cephadm/tasks/rados_api_tests.yaml diff --git a/qa/suites/rados/ssh/tasks/rados_python.yaml b/qa/suites/rados/cephadm/tasks/rados_python.yaml similarity index 100% rename from qa/suites/rados/ssh/tasks/rados_python.yaml rename to qa/suites/rados/cephadm/tasks/rados_python.yaml diff --git a/qa/suites/rados/mgr/tasks/ssh_orchestrator.yaml b/qa/suites/rados/mgr/tasks/cephadm_orchestrator.yaml similarity index 90% rename from qa/suites/rados/mgr/tasks/ssh_orchestrator.yaml rename to qa/suites/rados/mgr/tasks/cephadm_orchestrator.yaml index cd606f76094..6b88bfb4b55 100644 --- a/qa/suites/rados/mgr/tasks/ssh_orchestrator.yaml +++ b/qa/suites/rados/mgr/tasks/cephadm_orchestrator.yaml @@ -15,4 +15,4 @@ tasks: - No standby daemons available - cephfs_test_runner: modules: - - tasks.mgr.test_ssh_orchestrator + - tasks.mgr.test_cephadm_orchestrator 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 d137fddcc49..6cf32608d6b 100644 --- a/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml +++ b/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml @@ -20,7 +20,7 @@ tasks: - ceph-mgr-diskprediction-local - ceph-mgr-diskprediction-cloud - ceph-mgr-rook - - ceph-mgr-ssh + - ceph-mgr-cephadm - cephadm - ceph-mgr - libcephfs2 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 ded6183bd68..2ba6d4c098b 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 @@ -17,7 +17,7 @@ tasks: - ceph-mgr-diskprediction-local - ceph-mgr-diskprediction-cloud - ceph-mgr-rook - - ceph-mgr-ssh + - ceph-mgr-cephadm - cephadm - ceph-mgr - libcephfs2 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 d8e0f7f2daf..40856c1b5c0 100644 --- a/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml +++ b/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml @@ -16,7 +16,7 @@ tasks: - ceph-mgr-diskprediction-local - ceph-mgr-diskprediction-cloud - ceph-mgr-rook - - ceph-mgr-ssh + - ceph-mgr-cephadm - cephadm - ceph-mgr - libcephfs2 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 1ebe7af9c14..0238fd19906 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 @@ -17,7 +17,7 @@ tasks: - ceph-mgr-diskprediction-local - ceph-mgr-diskprediction-cloud - ceph-mgr-rook - - ceph-mgr-ssh + - ceph-mgr-cephadm - cephadm extra_packages: ['librados2'] - install.upgrade: 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 ccd3c06a31a..64004bde350 100644 --- a/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml +++ b/qa/suites/rados/thrash-old-clients/1-install/luminous.yaml @@ -16,7 +16,7 @@ tasks: - ceph-mgr-diskprediction-local - ceph-mgr-diskprediction-cloud - ceph-mgr-rook - - ceph-mgr-ssh + - ceph-mgr-cephadm - cephadm extra_packages: ['librados2'] - install.upgrade: 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 4c503f42fe2..e7e2961ce88 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 @@ -17,7 +17,7 @@ tasks: - ceph-mgr-diskprediction-local - ceph-mgr-diskprediction-cloud - ceph-mgr-rook - - ceph-mgr-ssh + - ceph-mgr-cephadm - cephadm extra_packages: ['librados2'] - install.upgrade: 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 20d4e00e213..dae4276cd72 100644 --- a/qa/suites/rados/thrash-old-clients/1-install/mimic.yaml +++ b/qa/suites/rados/thrash-old-clients/1-install/mimic.yaml @@ -17,7 +17,7 @@ tasks: - ceph-mgr-diskprediction-local - ceph-mgr-diskprediction-cloud - ceph-mgr-rook - - ceph-mgr-ssh + - ceph-mgr-cephadm - cephadm extra_packages: ['librados2'] - install.upgrade: 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 7d0040c3ecf..f04e16666ba 100644 --- a/qa/suites/upgrade/mimic-x-singleton/1-install/mimic.yaml +++ b/qa/suites/upgrade/mimic-x-singleton/1-install/mimic.yaml @@ -15,7 +15,7 @@ tasks: - ceph-mgr-diskprediction-local - ceph-mgr-diskprediction-cloud - ceph-mgr-rook - - ceph-mgr-ssh + - ceph-mgr-cephadm - cephadm extra_packages: ['librados2'] - print: "**** done install mimic" 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 bed82253772..92c5c9fd435 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 @@ -12,7 +12,7 @@ tasks: - ceph-mgr-diskprediction-local - ceph-mgr-diskprediction-cloud - ceph-mgr-rook - - ceph-mgr-ssh + - ceph-mgr-cephadm - cephadm extra_packages: ['librados2'] - print: "**** done installing mimic" 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 835a20fdb74..f001104f738 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 @@ -9,7 +9,7 @@ tasks: - ceph-mgr-diskprediction-local - ceph-mgr-diskprediction-cloud - ceph-mgr-rook - - ceph-mgr-ssh + - ceph-mgr-cephadm - cephadm extra_packages: ['librados2'] - print: "**** done install mimic" 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 064c2203cfd..31eb930600f 100644 --- a/qa/suites/upgrade/nautilus-x-singleton/1-install/nautilus.yaml +++ b/qa/suites/upgrade/nautilus-x-singleton/1-install/nautilus.yaml @@ -15,7 +15,7 @@ tasks: - ceph-mgr-diskprediction-local - ceph-mgr-diskprediction-cloud - ceph-mgr-rook - - ceph-mgr-ssh + - ceph-mgr-cephadm - cephadm extra_packages: ['librados2'] - print: "**** done install nautilus" diff --git a/qa/tasks/mgr/test_ssh_orchestrator.py b/qa/tasks/mgr/test_cephadm_orchestrator.py similarity index 89% rename from qa/tasks/mgr/test_ssh_orchestrator.py rename to qa/tasks/mgr/test_cephadm_orchestrator.py index 76a31dd332c..7c1bc826d8c 100644 --- a/qa/tasks/mgr/test_ssh_orchestrator.py +++ b/qa/tasks/mgr/test_cephadm_orchestrator.py @@ -15,8 +15,8 @@ class TestOrchestratorCli(MgrTestCase): def setUp(self): super(TestOrchestratorCli, self).setUp() self._load_module("orchestrator_cli") - self._load_module("ssh") - self._orch_cmd("set", "backend", "ssh") + self._load_module("cephadm") + self._orch_cmd("set", "backend", "cephadm") def test_host_ls(self): self._orch_cmd("host", "add", "osd0") diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index 98fe30b6d68..385790ea3f5 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -1243,14 +1243,14 @@ def command_bootstrap(): # ssh if not args.skip_ssh: - logger.info('Enabling ssh module...') - cli(['mgr', 'module', 'enable', 'ssh']) + logger.info('Enabling cephadm module...') + cli(['mgr', 'module', 'enable', 'cephadm']) logger.info('Setting orchestrator backend to ssh...') - cli(['orchestrator', 'set', 'backend', 'ssh']) + cli(['orchestrator', 'set', 'backend', 'cephadm']) logger.info('Generating ssh key...') - cli(['ssh', 'generate-key']) - ssh_pub = cli(['ssh', 'get-pub-key']) + cli(['cephadm', 'generate-key']) + ssh_pub = cli(['cephadm', 'get-pub-key']) with open(args.output_pub_ssh_key, 'w') as f: f.write(ssh_pub) diff --git a/src/common/options.cc b/src/common/options.cc index 10f1ad36469..bbe8a850fcc 100644 --- a/src/common/options.cc +++ b/src/common/options.cc @@ -437,7 +437,7 @@ std::vector