From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Thu, 11 Apr 2019 13:32:13 +0000 (+0200)
Subject: mgr/rook: Fix Python 2 regression
X-Git-Tag: v14.2.1~27^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F27496%2Fhead;p=ceph.git

mgr/rook: Fix Python 2 regression

Fixes: http://tracker.ceph.com/issues/39250

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit f9ba374d79cfc984d7209122a0dc88e4a3d2b96b)
---

diff --git a/src/pybind/mgr/rook/rook_cluster.py b/src/pybind/mgr/rook/rook_cluster.py
index 060d001318a4..2625ffee991d 100644
--- a/src/pybind/mgr/rook/rook_cluster.py
+++ b/src/pybind/mgr/rook/rook_cluster.py
@@ -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.