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 19d682c8ee3cdf4214dfbac1f81deb74509f42d1..db7c903d1655768489384f963e988fdb60894dd7 100644 (file)
--- 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 0c62ceab61cebd86565acb83edbdcfa9518fae99..e9614a50cb0d2269cd4dcc6ad7acf373c53591c3 100644 (file)
--- 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