Revision bb074298

b/tools/cluster-merge
341 341
    #
342 342
    # Generic checks
343 343
    #
344
    check_params = (
344
    check_params = [
345 345
      "beparams",
346 346
      "default_iallocator",
347 347
      "drbd_usermode_helper",
348
      "file_storage_dir",
349 348
      "hidden_os",
350 349
      "maintain_node_health",
351 350
      "master_netdev",
......
355 354
      "tags",
356 355
      "uid_pool",
357 356
      "volume_group_name",
358
      )
357
      ]
358
    if constants.ENABLE_FILE_STORAGE:
359
      check_params.append("file_storage_dir")
360

  
359 361
    for param_name in check_params:
360 362
      my_param = getattr(my_cluster, param_name)
361 363
      other_param = getattr(other_cluster, param_name)

Also available in: Unified diff