Revision 871705db

b/lib/cmdlib.py
414 414
  HPATH = "cluster-init"
415 415
  HTYPE = constants.HTYPE_CLUSTER
416 416
  _OP_REQP = ["cluster_name", "hypervisor_type", "vg_name", "mac_prefix",
417
              "def_bridge", "master_netdev"]
417
              "def_bridge", "master_netdev", "file_storage_dir"]
418 418
  REQ_CLUSTER = False
419 419

  
420 420
  def BuildHooksEnv(self):
......
478 478
    if vgstatus:
479 479
      raise errors.OpPrereqError("Error: %s" % vgstatus)
480 480

  
481
    if not os.path.isabs(self.op.file_storage_dir):
482
      raise errors.OpPrereqError("The file storage directory you have is"
483
                                 " not an absolute path.")
484

  
485
    if not os.path.exists(self.op.file_storage_dir):
486
      raise errors.OpPrereqError("Default file storage directory '%s' does "
487
                                 "not exist. Please create." %
488
                                 self.op.file_storage_dir)
489

  
481 490
    if not re.match("^[0-9a-z]{2}:[0-9a-z]{2}:[0-9a-z]{2}$",
482 491
                    self.op.mac_prefix):
483 492
      raise errors.OpPrereqError("Invalid mac prefix given '%s'" %
......
512 521
    ss.SetKey(ss.SS_MASTER_IP, clustername.ip)
513 522
    ss.SetKey(ss.SS_MASTER_NETDEV, self.op.master_netdev)
514 523
    ss.SetKey(ss.SS_CLUSTER_NAME, clustername.name)
524
    ss.SetKey(ss.SS_FILE_STORAGE_DIR, self.op.file_storage_dir)
515 525

  
516 526
    # set up the inter-node password and certificate
517 527
    _InitGanetiServerSetup(ss)

Also available in: Unified diff