From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Wed, 10 Mar 2021 12:37:10 +0000 (+0100)
Subject: Merge pull request #39541 from pcuzner/config-checker
X-Git-Tag: v17.1.0~2673
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=744edab3ffd9a3944dfba7b10b1bf8860ffa84a1;p=ceph.git

Merge pull request #39541 from pcuzner/config-checker

mgr/cephadm: Provide an integrated configuration validation feature

Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
---

744edab3ffd9a3944dfba7b10b1bf8860ffa84a1
diff --cc src/pybind/mgr/cephadm/module.py
index 0aa487d8edf5,11c930181091..119fd12943d7
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@@ -33,8 -34,10 +34,10 @@@ from mgr_module import MgrModule, Handl
  from mgr_util import create_self_signed_cert
  import secrets
  import orchestrator
+ from orchestrator.module import to_format, Format
+ 
  from orchestrator import OrchestratorError, OrchestratorValidationError, HostSpec, \
 -    CLICommandMeta, DaemonDescription, DaemonDescriptionStatus
 +    CLICommandMeta, DaemonDescription, DaemonDescriptionStatus, handle_orch_error
  from orchestrator._interface import GenericSpec
  from orchestrator._interface import daemon_type_to_service