LGTM, thanks
On Thu, Jan 16, 2014 at 3:26 PM, Klaus Aehlig <[email protected]> wrote: > As we have introduced a new cluster parameter, it should > be also visible when querying about the cluster configuration. > > Signed-off-by: Klaus Aehlig <[email protected]> > --- > lib/client/gnt_cluster.py | 3 +++ > lib/cmdlib/cluster.py | 1 + > src/Ganeti/Query/Server.hs | 2 ++ > 3 files changed, 6 insertions(+) > > diff --git a/lib/client/gnt_cluster.py b/lib/client/gnt_cluster.py > index 0ecc9fe..a2543ce 100644 > --- a/lib/client/gnt_cluster.py > +++ b/lib/client/gnt_cluster.py > @@ -515,6 +515,9 @@ def ShowClusterConfig(opts, args): > ("candidate pool size", > compat.TryToRoman(result["candidate_pool_size"], > convert=opts.roman_integers)), > + ("maximal number of jobs running simultaneously", > + compat.TryToRoman(result["max_running_jobs"], > + convert=opts.roman_integers)), > ("master netdev", result["master_netdev"]), > ("master netmask", result["master_netmask"]), > ("use external master IP address setup script", > diff --git a/lib/cmdlib/cluster.py b/lib/cmdlib/cluster.py > index db6a22a..d04bd69 100644 > --- a/lib/cmdlib/cluster.py > +++ b/lib/cmdlib/cluster.py > @@ -395,6 +395,7 @@ class LUClusterQuery(NoHooksLU): > "ndparams": cluster.ndparams, > "diskparams": cluster.diskparams, > "candidate_pool_size": cluster.candidate_pool_size, > + "max_running_jobs": cluster.max_running_jobs, > "master_netdev": cluster.master_netdev, > "master_netmask": cluster.master_netmask, > "use_external_mip_script": cluster.use_external_mip_script, > diff --git a/src/Ganeti/Query/Server.hs b/src/Ganeti/Query/Server.hs > index 93b47d1..e1ae45b 100644 > --- a/src/Ganeti/Query/Server.hs > +++ b/src/Ganeti/Query/Server.hs > @@ -128,6 +128,8 @@ handleCall _ _ cdata QueryClusterInfo = > , ("diskparams", showJSON $ clusterDiskparams cluster) > , ("candidate_pool_size", > showJSON $ clusterCandidatePoolSize cluster) > + , ("max_running_jobs", > + showJSON $ clusterMaxRunningJobs cluster) > , ("master_netdev", showJSON $ clusterMasterNetdev cluster) > , ("master_netmask", showJSON $ clusterMasterNetmask cluster) > , ("use_external_mip_script", > -- > 1.8.5.2 > >
