mgr/cephadm: adding new debug flag for testing purposes only

Signed-off-by: Redouane Kachach <[email protected]>

Author: rkachach

src/pybind/mgr/cephadm/module.py

@@ -410,6 +410,12 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule,
             default=False,
             desc='Log all refresh metadata. Includes daemon, device, and host info collected regularly. Only has effect if logging at debug level'
         ),
+        Option(
+            'certificate_check_debug_mode',
+            type='bool',
+            default=False,
+            desc='FOR TESTING ONLY: This flag forces the certificate check instead of waiting for certificate_check_period.',
+        ),
         Option(
             'certificate_automated_rotation_enabled',
             type='bool',
@@ -576,6 +582,7 @@ def __init__(self, *args: Any, **kwargs: Any):
             self.certificate_duration_days = 0
             self.certificate_renewal_threshold_days = 0
             self.certificate_automated_rotation_enabled = False
+            self.certificate_check_debug_mode = False
             self.certificate_check_period = 0
 
         self.notify(NotifyType.mon_map, None)

src/pybind/mgr/cephadm/serve.py

@@ -148,20 +148,20 @@ def _check_certificates(self) -> None:
 
         # Check certificates if:
         # - This is the first time (startup, last_certificates_check is None)
+        # - We are running in certificates check debug mode (for testing only)
         # - Or the elapsed time is greater than or equal to the configured check period
-        check_certificates = False
-        if self.last_certificates_check is None:
-            check_certificates = True
-        else:
-            elapsed_time = datetime_now() - self.last_certificates_check
-            check_certificates = elapsed_time.days >= self.mgr.certificate_check_period
+        check_certificates = (
+            self.last_certificates_check is None
+            or self.mgr.certificate_check_debug_mode
+            or (datetime_now() - self.last_certificates_check).days >= self.mgr.certificate_check_period
+        )
 
         if check_certificates:
             self.log.debug('_check_certificates')
             self.last_certificates_check = datetime_now()
             services_to_reconfig, _ = self.mgr.cert_mgr.check_services_certificates(fix_issues=True)
             for svc in services_to_reconfig:
-                logger.info(f'certmgr: certificate has changed, reconfiguring service {svc}')
+                self.log.info(f'certmgr: certificate has changed, reconfiguring service {svc}')
                 self.mgr.service_action('reconfig', svc)
 
     def _serve_sleep(self) -> None: