cluster-merge: remove usage of 'ENABLE_FILE_STORAGE'

[ganeti-local] / tools / cluster-merge

diff --git a/tools/cluster-merge b/tools/cluster-merge
index a4787d4..8f0fdc9 100755 (executable)
--- a/tools/cluster-merge
+++ b/tools/cluster-merge
@@ -435,7 +435,8 @@ class Merger(object):
     check_params_strict = [
       "volume_group_name",
     ]
-    if constants.ENABLE_FILE_STORAGE:
+    if my_cluster.IsFileStorageEnabled() or \
+        other_cluster.IsFileStorageEnabled():
       check_params_strict.append("file_storage_dir")
     if constants.ENABLE_SHARED_FILE_STORAGE:
       check_params_strict.append("shared_file_storage_dir")