From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Fri, 8 May 2020 16:59:49 +0000 (+0200)
Subject: Merge pull request #34950 from sebastian-philipp/cephadm-upgrade.py
X-Git-Tag: v16.1.0~2387
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bceb02a31f85d82e925918974beb670f88f608b8;p=ceph.git

Merge pull request #34950 from sebastian-philipp/cephadm-upgrade.py

mgr/cephadm: move upgrade code to upgrade.py

Reviewed-by: Michael Fritch <mfritch@suse.com>
---

bceb02a31f85d82e925918974beb670f88f608b8
diff --cc src/pybind/mgr/cephadm/module.py
index 157126a3aa20,22d80d8402b6..ed186899c1ee
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@@ -22,10 -24,10 +22,9 @@@ import tempfil
  import multiprocessing.pool
  import shutil
  import subprocess
- import uuid
  
 -from ceph.deployment import inventory, translate
 +from ceph.deployment import inventory
  from ceph.deployment.drive_group import DriveGroupSpec
 -from ceph.deployment.drive_selection.selector import DriveSelection
  from ceph.deployment.service_spec import \
      HostPlacementSpec, NFSServiceSpec, ServiceSpec, PlacementSpec, assert_valid_host
  
@@@ -36,13 -38,10 +35,14 @@@ from orchestrator import OrchestratorEr
  
  from . import remotes
  from . import utils
 -from .nfs import NFSGanesha
 -from .osd import RemoveUtil, OSDRemoval
 +from .services.cephadmservice import MonService, MgrService, MdsService, RgwService, \
 +    RbdMirrorService, CrashService, IscsiService
 +from .services.nfs import NFSService
 +from .services.osd import RemoveUtil, OSDRemoval, OSDService
 +from .services.monitoring import GrafanaService, AlertmanagerService, PrometheusService, \
 +    NodeExporterService
  from .inventory import Inventory, SpecStore, HostCache
+ from .upgrade import CEPH_UPGRADE_ORDER, CephadmUpgrade
  
  try:
      import remoto