From 41dcb3c814b1a4c9f92dfabf3270590448a69ae6 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 18 Mar 2020 20:56:44 -0500 Subject: [PATCH] mgr/orch: 'ceph upgrade ...' -> 'ceph orch upgrade ...' Signed-off-by: Sage Weil --- doc/cephadm/upgrade.rst | 14 +++++++------- .../rados/cephadm/upgrade/2-start-upgrade.yaml | 2 +- qa/suites/rados/cephadm/upgrade/3-wait.yaml | 2 +- src/pybind/mgr/orchestrator/module.py | 12 ++++++------ 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/doc/cephadm/upgrade.rst b/doc/cephadm/upgrade.rst index 9ffa68f65df93..ba194f7065767 100644 --- a/doc/cephadm/upgrade.rst +++ b/doc/cephadm/upgrade.rst @@ -28,11 +28,11 @@ and your cluster is healthy. To upgrade (or downgrade) to a specific release:: - # ceph upgrade start --version + # ceph orch upgrade start --version For example, to upgrade to v15.2.1:: - # ceph upgrade start --version 15.2.1 + # ceph orch upgrade start --version 15.2.1 Monitoring the upgrade @@ -41,7 +41,7 @@ Monitoring the upgrade Determine whether an upgrade is in process and what version the cluster is upgrading to with:: - # ceph upgrade status + # ceph orch upgrade status While the upgrade is underway, you will see a progress bar in the ceph status output. For example:: @@ -62,7 +62,7 @@ Canceling an upgrade You can stop the upgrade process at any time with:: - # ceph upgrade stop + # ceph orch upgrade stop Potential problems @@ -98,8 +98,8 @@ one or more hosts in the cluster. You can cancel the existing upgrade and specify a different target version with:: - # ceph upgrade stop - # ceph upgrade start --version + # ceph orch upgrade stop + # ceph orch upgrade start --version Using customized container images @@ -113,6 +113,6 @@ combining the ``container_image_base`` configuration option (default: You can also upgrade to an arbitrary container image. For example, to upgrade to a development build:: - # ceph upgrade start --image quay.io/ceph-ci/ceph:recent-git-branch-name + # ceph orch upgrade start --image quay.io/ceph-ci/ceph:recent-git-branch-name For more information about available container images, see :ref:`containers`. diff --git a/qa/suites/rados/cephadm/upgrade/2-start-upgrade.yaml b/qa/suites/rados/cephadm/upgrade/2-start-upgrade.yaml index a65d6001e78ab..6c52d78d615d4 100644 --- a/qa/suites/rados/cephadm/upgrade/2-start-upgrade.yaml +++ b/qa/suites/rados/cephadm/upgrade/2-start-upgrade.yaml @@ -2,4 +2,4 @@ tasks: - cephadm.shell: env: [sha1] mon.a: - - ceph upgrade start --image quay.io/ceph-ci/ceph:$sha1 + - ceph orch upgrade start --image quay.io/ceph-ci/ceph:$sha1 diff --git a/qa/suites/rados/cephadm/upgrade/3-wait.yaml b/qa/suites/rados/cephadm/upgrade/3-wait.yaml index 4d3e4f1eb1f21..e14aabff5f085 100644 --- a/qa/suites/rados/cephadm/upgrade/3-wait.yaml +++ b/qa/suites/rados/cephadm/upgrade/3-wait.yaml @@ -2,7 +2,7 @@ tasks: - cephadm.shell: env: [sha1] mon.a: - - while ceph upgrade status | jq '.in_progress' | grep true ; do ceph orch ps ; ceph versions ; sleep 30 ; done + - while ceph orch upgrade status | jq '.in_progress' | grep true ; do ceph orch ps ; ceph versions ; sleep 30 ; done - ceph orch ps - ceph versions - ceph versions | jq -e '.overall | length == 1' diff --git a/src/pybind/mgr/orchestrator/module.py b/src/pybind/mgr/orchestrator/module.py index a0de33fa0c76d..03c28a8063f31 100644 --- a/src/pybind/mgr/orchestrator/module.py +++ b/src/pybind/mgr/orchestrator/module.py @@ -901,7 +901,7 @@ Usage: assert c.has_result @_cli_write_command( - 'upgrade check', + 'orch upgrade check', 'name=image,type=CephString,req=false ' 'name=ceph_version,type=CephString,req=false', desc='Check service versions vs available and target containers') @@ -912,7 +912,7 @@ Usage: return HandleCommandResult(stdout=completion.result_str()) @_cli_write_command( - 'upgrade status', + 'orch upgrade status', desc='Check service versions vs available and target containers') def _upgrade_status(self): completion = self.upgrade_status() @@ -928,7 +928,7 @@ Usage: return HandleCommandResult(stdout=out) @_cli_write_command( - 'upgrade start', + 'orch upgrade start', 'name=image,type=CephString,req=false ' 'name=ceph_version,type=CephString,req=false', desc='Initiate upgrade') @@ -939,7 +939,7 @@ Usage: return HandleCommandResult(stdout=completion.result_str()) @_cli_write_command( - 'upgrade pause', + 'orch upgrade pause', desc='Pause an in-progress upgrade') def _upgrade_pause(self): completion = self.upgrade_pause() @@ -948,7 +948,7 @@ Usage: return HandleCommandResult(stdout=completion.result_str()) @_cli_write_command( - 'upgrade resume', + 'orch upgrade resume', desc='Resume paused upgrade') def _upgrade_resume(self): completion = self.upgrade_resume() @@ -957,7 +957,7 @@ Usage: return HandleCommandResult(stdout=completion.result_str()) @_cli_write_command( - 'upgrade stop', + 'orch upgrade stop', desc='Stop an in-progress upgrade') def _upgrade_stop(self): completion = self.upgrade_stop() -- 2.39.5