From: Adam King <adking@redhat.com>
Date: Wed, 27 Sep 2023 18:27:18 +0000 (-0400)
Subject: cephadm: move logging from registry_login to command_registry_login
X-Git-Tag: v19.0.0~383^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=90322fb617518bf3c5e4c23f40fdc6ee9cd032ee;p=ceph.git

cephadm: move logging from registry_login to command_registry_login

So that registry_login can be moved to container_engines.py
without creating a dependency on logging there

Signed-off-by: Adam King <adking@redhat.com>
---

diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py
index 30a824f2983a5..a0ebf7e96b5e9 100755
--- a/src/cephadm/cephadm.py
+++ b/src/cephadm/cephadm.py
@@ -5272,6 +5272,7 @@ def command_bootstrap(ctx):
 
 
 def command_registry_login(ctx: CephadmContext) -> int:
+    logger.info('Logging into custom registry.')
     if ctx.registry_json:
         logger.info('Pulling custom registry login info from %s.' % ctx.registry_json)
         d = get_parm(ctx.registry_json)
@@ -5298,7 +5299,6 @@ def command_registry_login(ctx: CephadmContext) -> int:
 
 
 def registry_login(ctx: CephadmContext, url: Optional[str], username: Optional[str], password: Optional[str]) -> None:
-    logger.info('Logging into custom registry.')
     try:
         engine = ctx.container_engine
         cmd = [engine.path, 'login',