From: Michael Fritch <mfritch@suse.com>
Date: Tue, 3 Mar 2020 15:15:57 +0000 (-0700)
Subject: mgr/volumes: use `SafeConfigParser` with py2
X-Git-Tag: v14.2.10~189^2~24
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=363102ea4960d65d4316b66b18d7161e833d0c83;p=ceph.git

mgr/volumes: use `SafeConfigParser` with py2

Python3.2 renamed `SafeConfigParser` -> `ConfigParser`

Fixes: https://tracker.ceph.com/issues/44393
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 23efb9240ea6187386677e262dab7f87e1dbac42)
---

diff --git a/src/pybind/mgr/volumes/fs/operations/versions/metadata_manager.py b/src/pybind/mgr/volumes/fs/operations/versions/metadata_manager.py
index ef2d23e2dbad..1b6c43278378 100644
--- a/src/pybind/mgr/volumes/fs/operations/versions/metadata_manager.py
+++ b/src/pybind/mgr/volumes/fs/operations/versions/metadata_manager.py
@@ -32,7 +32,10 @@ class MetadataManager(object):
         self.fs = fs
         self.mode = mode
         self.config_path = config_path
-        self.config = configparser.ConfigParser()
+        if sys.version_info >= (3, 2):
+            self.config = configparser.ConfigParser()
+        else:
+            self.config = configparser.SafeConfigParser()
 
     def refresh(self):
         fd = None