Show info about new params in gnt-cluster info
authorHrvoje Ribicic <riba@google.com>
Mon, 12 Oct 2015 20:42:35 +0000 (20:42 +0000)
committerHrvoje Ribicic <riba@google.com>
Fri, 20 Nov 2015 10:13:59 +0000 (11:13 +0100)
With this patch, gnt-cluster info shows both the ssh key type and the
key length.

Signed-off-by: Hrvoje Ribicic <riba@google.com>
Reviewed-by: Helga Velroyen <helgav@google.com>

lib/client/gnt_cluster.py
src/Ganeti/Query/Server.hs

index 946047a..618415b 100644 (file)
@@ -625,6 +625,8 @@ def ShowClusterConfig(opts, args):
       ("compression tools", result["compression_tools"]),
       ("enabled user shutdown", result["enabled_user_shutdown"]),
       ("modify ssh setup", result["modify_ssh_setup"]),
+      ("ssh_key_type", result["ssh_key_type"]),
+      ("ssh_key_bits", result["ssh_key_bits"]),
       ]),
 
     ("Default node parameters",
index fc252c5..8806183 100644 (file)
@@ -272,6 +272,8 @@ handleCall _ _ cdata QueryClusterInfo =
                         $ clusterDataCollectors cluster)
             , ("modify_ssh_setup",
                showJSON $ clusterModifySshSetup cluster)
+            , ("ssh_key_type", showJSON $ clusterSshKeyType cluster)
+            , ("ssh_key_bits", showJSON $ clusterSshKeyBits cluster)
             ]
 
   in case master of