From: Michael Fritch <mfritch@suse.com>
Date: Wed, 16 Mar 2022 13:39:03 +0000 (-0600)
Subject: cephadm: infer the default container image during pull
X-Git-Tag: v15.2.17~55^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=2d48d22bfc3e340c504b15a67237acd9b189691e;p=ceph.git

cephadm: infer the default container image during pull

Fixes: https://tracker.ceph.com/issues/54588
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 736af2b9c29e375a184b863220641b7d254e7d04)
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 4793dfa450565..570eb085b0f28 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -2754,7 +2754,7 @@ def command_version():
 ##################################
 
 
-@infer_image
+@default_image
 def command_pull():
     # type: () -> int
 
@@ -5697,7 +5697,7 @@ def _get_parser():
     parser_version.set_defaults(func=command_version)
 
     parser_pull = subparsers.add_parser(
-        'pull', help='pull latest image version')
+        'pull', help='pull the default container image')
     parser_pull.set_defaults(func=command_pull)
 
     parser_inspect_image = subparsers.add_parser(
@@ -5749,7 +5749,7 @@ def _get_parser():
     parser_adopt.add_argument(
         '--skip-pull',
         action='store_true',
-        help='do not pull the latest image before adopting')
+        help='do not pull the default image before adopting')
     parser_adopt.add_argument(
         '--force-start',
         action='store_true',
@@ -5998,7 +5998,7 @@ def _get_parser():
     parser_bootstrap.add_argument(
         '--skip-pull',
         action='store_true',
-        help='do not pull the latest image before bootstrapping')
+        help='do not pull the default image before bootstrapping')
     parser_bootstrap.add_argument(
         '--skip-firewalld',
         action='store_true',