Include mac-prefix setting in the output of 'gnt-cluster info'
command.
This fixes part of issue 239.
---
lib/client/gnt_cluster.py | 1 +
lib/cmdlib/cluster.py | 1 +
src/Ganeti/Query/Server.hs | 1 +
3 files changed, 3 insertions(+)
diff --git a/lib/client/gnt_cluster.py b/lib/client/gnt_cluster.py
index de4e607..212ed6e 100644
--- a/lib/client/gnt_cluster.py
+++ b/lib/client/gnt_cluster.py
@@ -519,6 +519,7 @@ def ShowClusterConfig(opts, args):
("maximal number of jobs running simultaneously",
compat.TryToRoman(result["max_running_jobs"],
convert=opts.roman_integers)),
+ ("mac prefix", result["mac_prefix"]),
("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 652ae45..56fc13a 100644
--- a/lib/cmdlib/cluster.py
+++ b/lib/cmdlib/cluster.py
@@ -410,6 +410,7 @@ class LUClusterQuery(NoHooksLU):
"diskparams": cluster.diskparams,
"candidate_pool_size": cluster.candidate_pool_size,
"max_running_jobs": cluster.max_running_jobs,
+ "mac_prefix": cluster.mac_prefix,
"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 a0750a6..397ad4b 100644
--- a/src/Ganeti/Query/Server.hs
+++ b/src/Ganeti/Query/Server.hs
@@ -134,6 +134,7 @@ handleCall _ _ cdata QueryClusterInfo =
showJSON $ clusterCandidatePoolSize cluster)
, ("max_running_jobs",
showJSON $ clusterMaxRunningJobs cluster)
+ , ("mac_prefix", showJSON $ clusterMacPrefix cluster)
, ("master_netdev", showJSON $ clusterMasterNetdev cluster)
, ("master_netmask", showJSON $ clusterMasterNetmask cluster)
, ("use_external_mip_script",
--
1.7.10.4
