LGTM, thanks On Fri, 20 Nov 2015 at 10:59 'Hrvoje Ribicic' via ganeti-devel < [email protected]> wrote:
> With this patch, gnt-cluster info shows both the ssh key type and the > key length. > > Signed-off-by: Hrvoje Ribicic <[email protected]> > --- > lib/client/gnt_cluster.py | 2 ++ > src/Ganeti/Query/Server.hs | 2 ++ > 2 files changed, 4 insertions(+) > > diff --git a/lib/client/gnt_cluster.py b/lib/client/gnt_cluster.py > index 946047a..618415b 100644 > --- a/lib/client/gnt_cluster.py > +++ b/lib/client/gnt_cluster.py > @@ -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", > diff --git a/src/Ganeti/Query/Server.hs b/src/Ganeti/Query/Server.hs > index fc252c5..8806183 100644 > --- a/src/Ganeti/Query/Server.hs > +++ b/src/Ganeti/Query/Server.hs > @@ -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 > -- > 2.1.4 > > -- Helga Velroyen Software Engineer [email protected] Google Germany GmbH Dienerstraße 12 80331 München Geschäftsführer: Matthew Scott Sucherman, Paul Terence Manicle Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Diese E-Mail ist vertraulich. Wenn Sie nicht der richtige Adressat sind, leiten Sie diese bitte nicht weiter, informieren Sie den Absender und löschen Sie die E-Mail und alle Anhänge. Vielen Dank. This e-mail is confidential. If you are not the right addressee please do not forward it, please inform the sender, and please erase this e-mail including any attachments. Thanks.
