From: Adam King <47704447+adk3798@users.noreply.github.com>
Date: Thu, 13 Jan 2022 17:03:50 +0000 (-0500)
Subject: Merge pull request #44306 from sebastian-philipp/normalize_image_digest-ambiguity
X-Git-Tag: v17.1.0~67
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f3ca30449d9f41a5505d054cde1be558af2d9f3d;p=ceph.git

Merge pull request #44306 from sebastian-philipp/normalize_image_digest-ambiguity

cephadm: deal with ambiguity within normalize_image_digest

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Sage Weil <sage@newdream.net>
---

f3ca30449d9f41a5505d054cde1be558af2d9f3d
diff --cc src/pybind/mgr/cephadm/module.py
index ec2eeee038bd,cf2648b2aeb9..146153e137e0
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@@ -301,9 -294,8 +301,9 @@@ class CephadmOrchestrator(orchestrator.
              'registry_password',
              type='str',
              default=None,
-             desc='Custom repository password'
+             desc='Custom repository password. Only used for logging into a registry.'
          ),
 +        ####
          Option(
              'registry_insecure',
              type='bool',