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>

diff --cc src/cephadm/cephadm
Simple merge

diff --cc src/pybind/mgr/cephadm/module.py
index ec2eeee038bd1e25e40d28426c19faf633f84b57,cf2648b2aeb9ad3f9edfbaf4f0e571334d8e4ce4..146153e137e0571d44918de192165f671c9cba63
--- 1/src/pybind/mgr/cephadm/module.py
--- 2/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',

diff --cc src/pybind/mgr/cephadm/upgrade.py
Simple merge

diff --cc src/pybind/mgr/tox.ini
Simple merge