]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #39541 from pcuzner/config-checker
authorSebastian Wagner <sebastian.wagner@suse.com>
Wed, 10 Mar 2021 12:37:10 +0000 (13:37 +0100)
committerGitHub <noreply@github.com>
Wed, 10 Mar 2021 12:37:10 +0000 (13:37 +0100)
mgr/cephadm: Provide an integrated configuration validation feature

Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
1  2 
doc/cephadm/operations.rst
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/cephadm/serve.py

Simple merge
index 0aa487d8edf5f04385569a10ff8240ae41db9d51,11c9301810914be49f9c5abd6340b4b10345043e..119fd12943d7a56ebaf2d9e544689a47bafd5d4b
@@@ -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
  
Simple merge