From: Alfonso Martínez <almartin@redhat.com>
Date: Tue, 12 May 2020 12:04:41 +0000 (+0200)
Subject: mgr/dashboard: fix py2 strptime ImportError (not thread safe)
X-Git-Tag: v14.2.10~81^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1a0367fa012957889ff6167b2df676b2649bd352;p=ceph.git

mgr/dashboard: fix py2 strptime ImportError (not thread safe)

Fixes: https://tracker.ceph.com/issues/45515
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
---

diff --git a/src/pybind/mgr/dashboard/module.py b/src/pybind/mgr/dashboard/module.py
index 19d682c8ee3c..db7c903d1655 100644
--- a/src/pybind/mgr/dashboard/module.py
+++ b/src/pybind/mgr/dashboard/module.py
@@ -13,6 +13,7 @@ import threading
 import time
 from uuid import uuid4
 from OpenSSL import crypto
+import _strptime  # pylint: disable=unused-import
 from mgr_module import MgrModule, MgrStandbyModule, Option, CLIWriteCommand
 from mgr_util import get_default_addr, ServerConfigException, verify_tls_files
 
diff --git a/src/pybind/mgr/dashboard/tox.ini b/src/pybind/mgr/dashboard/tox.ini
index 0c62ceab61ce..e9614a50cb0d 100644
--- a/src/pybind/mgr/dashboard/tox.ini
+++ b/src/pybind/mgr/dashboard/tox.ini
@@ -10,7 +10,7 @@ setenv=
     UNITTEST = true
     WEBTEST_INTERACTIVE = false
     LD_LIBRARY_PATH = {toxinidir}/../../../../build/lib
-    PATH = {toxinidir}/../../../../build/bin:$PATH
+    PATH = {toxinidir}/../../../../build/bin:{env:PATH}
     py27: PYTHONPATH = {env:CEPH_LIB}/cython_modules/lib.2
     py3:  PYTHONPATH = {env:CEPH_LIB}/cython_modules/lib.3
     cov:  UNITTEST = true