LUClusterSetParams: When ipolicy is updated warn for new violations

[ganeti-local] / lib / client / gnt_cluster.py

diff --git a/lib/client/gnt_cluster.py b/lib/client/gnt_cluster.py
index 4350f16..2fa42cd 100644 (file)
--- a/lib/client/gnt_cluster.py
+++ b/lib/client/gnt_cluster.py
@@ -143,14 +143,14 @@ def InitCluster(opts, args):
     utils.ForceDictType(diskparams[templ], constants.DISK_DT_TYPES)
 
   # prepare ipolicy dict
-  ispecs_dts = opts.ispecs_disk_templates # hate long var names
+  ispecs_dts = opts.ipolicy_disk_templates # hate long var names
   ipolicy_raw = \
     objects.CreateIPolicyFromOpts(ispecs_mem_size=opts.ispecs_mem_size,
                                   ispecs_cpu_count=opts.ispecs_cpu_count,
                                   ispecs_disk_count=opts.ispecs_disk_count,
                                   ispecs_disk_size=opts.ispecs_disk_size,
                                   ispecs_nic_count=opts.ispecs_nic_count,
-                                  ispecs_disk_templates=ispecs_dts,
+                                  ipolicy_disk_templates=ispecs_dts,
                                   fill_all=True)
   ipolicy = objects.FillIPolicy(constants.IPOLICY_DEFAULTS, ipolicy_raw)
 
@@ -467,7 +467,7 @@ def ShowClusterConfig(opts, args):
     ToStdout("  - %s", key)
     _PrintGroupedParams(result["ipolicy"][key], roman=opts.roman_integers)
   ToStdout("  - enabled disk templates: %s",
-           utils.CommaJoin(result["ipolicy"][constants.ISPECS_DTS]))
+           utils.CommaJoin(result["ipolicy"][constants.IPOLICY_DTS]))
 
   return 0
 
@@ -995,14 +995,14 @@ def SetClusterParams(opts, args):
   if ndparams is not None:
     utils.ForceDictType(ndparams, constants.NDS_PARAMETER_TYPES)
 
-  ispecs_dts = opts.ispecs_disk_templates
+  ispecs_dts = opts.ipolicy_disk_templates
   ipolicy = \
     objects.CreateIPolicyFromOpts(ispecs_mem_size=opts.ispecs_mem_size,
                                   ispecs_cpu_count=opts.ispecs_cpu_count,
                                   ispecs_disk_count=opts.ispecs_disk_count,
                                   ispecs_disk_size=opts.ispecs_disk_size,
                                   ispecs_nic_count=opts.ispecs_nic_count,
-                                  ispecs_disk_templates=ispecs_dts)
+                                  ipolicy_disk_templates=ispecs_dts)
 
   mnh = opts.maintain_node_health