mgr/ssh: parse new datetime

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/pybind/mgr/ssh/module.py b/src/pybind/mgr/ssh/module.py
index b6ebad6e5ed7aedfb12549421c4214d8e1dd7c4b..1fef4c8b1fd8d7dd32c0a12becbcacab480334c0 100644 (file)
--- a/src/pybind/mgr/ssh/module.py
+++ b/src/pybind/mgr/ssh/module.py
@@ -18,7 +18,7 @@ except ImportError as e:
     remoto = None
     remoto_import_error = str(e)
 
-DATEFMT = '%Y-%m-%d %H:%M:%S.%f'
+DATEFMT = '%Y-%m-%dT%H:%M:%S.%f%z'
 
 # high-level TODO:
 #  - bring over some of the protections from ceph-deploy that guard against
@@ -183,8 +183,6 @@ class SSHOrchestrator(MgrModule, orchestrator.Orchestrator):
 
     @staticmethod
     def time_from_string(timestr):
-        # drop the 'Z' timezone indication, it's always UTC
-        timestr = timestr.rstrip('Z')
         return datetime.datetime.strptime(timestr, DATEFMT)
 
     def _get_cluster_fsid(self):