Revision d04c9d45 lib/client/gnt_cluster.py

b/lib/client/gnt_cluster.py
143 143
    utils.ForceDictType(diskparams[templ], constants.DISK_DT_TYPES)
144 144

  
145 145
  # prepare ipolicy dict
146
  ispecs_dts = opts.ispecs_disk_templates # hate long var names
146
  ispecs_dts = opts.ipolicy_disk_templates # hate long var names
147 147
  ipolicy_raw = \
148 148
    objects.CreateIPolicyFromOpts(ispecs_mem_size=opts.ispecs_mem_size,
149 149
                                  ispecs_cpu_count=opts.ispecs_cpu_count,
150 150
                                  ispecs_disk_count=opts.ispecs_disk_count,
151 151
                                  ispecs_disk_size=opts.ispecs_disk_size,
152 152
                                  ispecs_nic_count=opts.ispecs_nic_count,
153
                                  ispecs_disk_templates=ispecs_dts,
153
                                  ipolicy_disk_templates=ispecs_dts,
154 154
                                  fill_all=True)
155 155
  ipolicy = objects.FillIPolicy(constants.IPOLICY_DEFAULTS, ipolicy_raw)
156 156

  
......
467 467
    ToStdout("  - %s", key)
468 468
    _PrintGroupedParams(result["ipolicy"][key], roman=opts.roman_integers)
469 469
  ToStdout("  - enabled disk templates: %s",
470
           utils.CommaJoin(result["ipolicy"][constants.ISPECS_DTS]))
470
           utils.CommaJoin(result["ipolicy"][constants.IPOLICY_DTS]))
471 471

  
472 472
  return 0
473 473

  
......
995 995
  if ndparams is not None:
996 996
    utils.ForceDictType(ndparams, constants.NDS_PARAMETER_TYPES)
997 997

  
998
  ispecs_dts = opts.ispecs_disk_templates
998
  ispecs_dts = opts.ipolicy_disk_templates
999 999
  ipolicy = \
1000 1000
    objects.CreateIPolicyFromOpts(ispecs_mem_size=opts.ispecs_mem_size,
1001 1001
                                  ispecs_cpu_count=opts.ispecs_cpu_count,
1002 1002
                                  ispecs_disk_count=opts.ispecs_disk_count,
1003 1003
                                  ispecs_disk_size=opts.ispecs_disk_size,
1004 1004
                                  ispecs_nic_count=opts.ispecs_nic_count,
1005
                                  ispecs_disk_templates=ispecs_dts)
1005
                                  ipolicy_disk_templates=ispecs_dts)
1006 1006

  
1007 1007
  mnh = opts.maintain_node_health
1008 1008

  

Also available in: Unified diff