]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #32207 from bk201/wip-43136
authorLaura Paduano <lpaduano@suse.com>
Tue, 17 Dec 2019 09:57:43 +0000 (10:57 +0100)
committerGitHub <noreply@github.com>
Tue, 17 Dec 2019 09:57:43 +0000 (10:57 +0100)
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>
1  2 
src/pybind/mgr/dashboard/controllers/orchestrator.py

index 660203340d86591c95b86689814e7fede26cd924,6235f209ee0fdefc59b371e4c63a4d73605fe329..b95b9548b687d4d25ada367b3e64787d1ea7fb63
@@@ -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