From: Laura Paduano <lpaduano@suse.com>
Date: Tue, 17 Dec 2019 09:57:43 +0000 (+0100)
Subject: Merge pull request #32207 from bk201/wip-43136
X-Git-Tag: v15.1.0~465
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8186dd98a621a0c427e7326f33adbb45190e7e92;p=ceph.git

Merge pull request #32207 from bk201/wip-43136

mgr/dashboard: Fix OSD IDs are not displayed when using cephadm backend

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Ernesto Puertat <epuertat@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
---

8186dd98a621a0c427e7326f33adbb45190e7e92
diff --cc src/pybind/mgr/dashboard/controllers/orchestrator.py
index 660203340d8,6235f209ee0..b95b9548b68
--- a/src/pybind/mgr/dashboard/controllers/orchestrator.py
+++ b/src/pybind/mgr/dashboard/controllers/orchestrator.py
@@@ -1,16 -1,11 +1,17 @@@
  # -*- coding: utf-8 -*-
  from __future__ import absolute_import
+ import os.path
  
 +import time
 +
  import cherrypy
 -from ceph.deployment.drive_group import DriveGroupSpec, DriveGroupValidationError
  
 -from . import ApiController, Endpoint, ReadPermission
 +try:
 +    from ceph.deployment.drive_group import DriveGroupSpec, DriveGroupValidationError
 +except ImportError:
 +    pass
 +
 +from . import ApiController, Endpoint, ReadPermission, UpdatePermission
  from . import RESTController, Task
  from .. import mgr
  from ..exceptions import DashboardException