From 630f0c8ad305c074c399c35b9547a9a6a501af3b Mon Sep 17 00:00:00 2001 From: Zac Dover Date: Thu, 6 May 2021 10:54:24 +1000 Subject: [PATCH] doc/cephadm: rewrite "using customized con..." This PR rewrites the text in "Using Customized Container Images" so that it is just a bit clearer, and it also formats the prompt in the text correctly. Signed-off-by: Zac Dover --- doc/cephadm/upgrade.rst | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/doc/cephadm/upgrade.rst b/doc/cephadm/upgrade.rst index 64ba6dadbb52..56adf71edb3d 100644 --- a/doc/cephadm/upgrade.rst +++ b/doc/cephadm/upgrade.rst @@ -105,14 +105,17 @@ You can cancel the existing upgrade and specify a different target version with: Using customized container images ================================= -For most users, simplify specifying the Ceph version is sufficient. -Cephadm will locate the specific Ceph container image to use by -combining the ``container_image_base`` configuration option (default: -``docker.io/ceph/ceph``) with a tag of ``vX.Y.Z``. +For most users, upgrading requires nothing more complicated than specifying the +Ceph version number to upgrade to. In such cases, cephadm locates the specific +Ceph container image to use by combining the ``container_image_base`` +configuration option (default: ``docker.io/ceph/ceph``) with a tag of +``vX.Y.Z``. -You can also upgrade to an arbitrary container image. For example, to -upgrade to a development build:: +But it is possible to upgrade to an arbitrary container image, if that's what +you need. For example, the following command upgrades to a development build: - # ceph orch upgrade start --image quay.io/ceph-ci/ceph:recent-git-branch-name +.. prompt:: bash # + + ceph orch upgrade start --image quay.io/ceph-ci/ceph:recent-git-branch-name For more information about available container images, see :ref:`containers`. -- 2.47.3