Revision 294254b1 lib/cmdlib/cluster.py

b/lib/cmdlib/cluster.py
57 57
  GetUpdatedIPolicy, ComputeNewInstanceViolations, GetUpdatedParams, \
58 58
  CheckOSParams, CheckHVParams, AdjustCandidatePool, CheckNodePVs, \
59 59
  ComputeIPolicyInstanceViolation, AnnotateDiskParams, SupportsOob, \
60
  CheckIpolicyVsDiskTemplates
60
  CheckIpolicyVsDiskTemplates, CheckDiskAccessModeValidity, \
61
  CheckDiskAccessModeConsistency
61 62

  
62 63
import ganeti.masterd.instance
63 64

  
......
704 705
        utils.ForceDictType(dt_params, constants.DISK_DT_TYPES)
705 706
      try:
706 707
        utils.VerifyDictOptions(self.op.diskparams, constants.DISK_DT_DEFAULTS)
708
        CheckDiskAccessModeValidity(self.op.diskparams)
707 709
      except errors.OpPrereqError, err:
708 710
        raise errors.OpPrereqError("While verify diskparams options: %s" % err,
709 711
                                   errors.ECODE_INVAL)
......
1024 1026
          self.new_diskparams[dt_name] = dt_params
1025 1027
        else:
1026 1028
          self.new_diskparams[dt_name].update(dt_params)
1029
      CheckDiskAccessModeConsistency(self.op.diskparams, self.cfg)
1027 1030

  
1028 1031
    # os hypervisor parameters
1029 1032
    self.new_os_hvp = objects.FillDict(cluster.os_hvp, {})

Also available in: Unified diff