]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/dashboard: pass str as the 2nd param of set_store()
authorKefu Chai <kchai@redhat.com>
Sun, 17 Jan 2021 08:09:36 +0000 (16:09 +0800)
committerSebastian Wagner <sebastian.wagner@suse.com>
Fri, 29 Jan 2021 12:42:38 +0000 (13:42 +0100)
MgrModule.set_store() only accepts str or None as its second
parameter.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 2d20390b17649beae72a0be1eb6da286ed9788ae)

src/pybind/mgr/dashboard/module.py

index 087eda5738048dc5d04222bc274717a2930699ad..6c6fe9295b0bf01d736ec6bc2abf99f572861907 100644 (file)
@@ -367,9 +367,9 @@ class Module(MgrModule, CherryPyConfig):
             return -errno.EINVAL, '',\
                 'Please specify the certificate file with "-i" option'
         if mgr_id is not None:
-            self.set_store('{}/crt'.format(mgr_id), inbuf)
+            self.set_store('{}/crt'.format(mgr_id), inbuf.decode())
         else:
-            self.set_store('crt', inbuf)
+            self.set_store('crt', inbuf.decode())
         return 0, 'SSL certificate updated', ''
 
     @CLIWriteCommand("dashboard set-ssl-certificate-key")
@@ -380,9 +380,9 @@ class Module(MgrModule, CherryPyConfig):
             return -errno.EINVAL, '',\
                 'Please specify the certificate key file with "-i" option'
         if mgr_id is not None:
-            self.set_store('{}/key'.format(mgr_id), inbuf)
+            self.set_store('{}/key'.format(mgr_id), inbuf.decode())
         else:
-            self.set_store('key', inbuf)
+            self.set_store('key', inbuf.decode())
         return 0, 'SSL certificate key updated', ''
 
     def handle_command(self, inbuf, cmd):