Revision 6a34eb01 tools/cluster-merge

b/tools/cluster-merge
435 435 
    check_params_strict = [
436 436 
      "volume_group_name",
437 437 
    ]
438 
    if constants.ENABLE_FILE_STORAGE:
438 
    if my_cluster.IsFileStorageEnabled() or \
439 
        other_cluster.IsFileStorageEnabled():
439 440 
      check_params_strict.append("file_storage_dir")
440 441 
    if constants.ENABLE_SHARED_FILE_STORAGE:
441 442 
      check_params_strict.append("shared_file_storage_dir")

Also available in: Unified diff