From: Peng Zhang <zphj1987@gmail.com>
Date: Tue, 4 Jul 2017 08:08:28 +0000 (+0800)
Subject: ceph-mgr:fix ceph-mgr web get kernel_version error
X-Git-Tag: v12.1.1~197^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F16094%2Fhead;p=ceph.git

ceph-mgr:fix ceph-mgr web get kernel_version error

fix :
File "/usr/lib64/ceph/mgr/dashboard/module.py", line 523, in _clients
client['version'] = client['kernel_version']
----------

change client['kernel_version'] to
client['client_metadata']['kernel_version']

Signed-off-by: Peng Zhang zphj1987@gmail.com
---

diff --git a/src/pybind/mgr/dashboard/module.py b/src/pybind/mgr/dashboard/module.py
index 02c824bd56fd..9d417a3e63be 100644
--- a/src/pybind/mgr/dashboard/module.py
+++ b/src/pybind/mgr/dashboard/module.py
@@ -536,7 +536,7 @@ class Module(MgrModule):
                         client['hostname'] = client['client_metadata']['hostname']
                     elif "kernel_version" in client['client_metadata']:
                         client['type'] = "kernel"
-                        client['version'] = client['kernel_version']
+                        client['version'] = client['client_metadata']['kernel_version']
                         client['hostname'] = client['client_metadata']['hostname']
                     else:
                         client['type'] = "unknown"