]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/rook: Fix Python 2 regression 27496/head
authorSebastian Wagner <sebastian.wagner@suse.com>
Thu, 11 Apr 2019 13:32:13 +0000 (15:32 +0200)
committerSebastian Wagner <sebastian.wagner@suse.com>
Fri, 12 Apr 2019 11:43:21 +0000 (13:43 +0200)
Fixes: http://tracker.ceph.com/issues/39250
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit f9ba374d79cfc984d7209122a0dc88e4a3d2b96b)

src/pybind/mgr/rook/rook_cluster.py

index 060d001318a442e92088e54990c62babd98c1464..2625ffee991d39bcb083d44cca99371de3fe7ad0 100644 (file)
@@ -9,7 +9,6 @@ This module is runnable outside of ceph-mgr, useful for testing.
 import logging
 import json
 from contextlib import contextmanager
-from typing import List
 
 from six.moves.urllib.parse import urljoin  # pylint: disable=import-error
 
@@ -23,6 +22,7 @@ except ImportError:
 try:
     import orchestrator
     from rook.module import RookEnv
+    from typing import List
 except ImportError:
     pass  # just used for type checking.