From bb074298bec117f5556ab3f713416b85b069b470 Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Thu, 4 Aug 2011 15:01:04 +0100
Subject: [PATCH] cluster-merge: consider file storage enable state
There's no point in checking whether the file storage dir in the two
clusters is the same if file storage is not even enabled
Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
tools/cluster-merge | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/tools/cluster-merge b/tools/cluster-merge
index 60252111c..8d116ea44 100755
--- a/tools/cluster-merge
+++ b/tools/cluster-merge
@@ -341,11 +341,10 @@ class Merger(object):
#
# Generic checks
#
- check_params = (
+ check_params = [
"beparams",
"default_iallocator",
"drbd_usermode_helper",
- "file_storage_dir",
"hidden_os",
"maintain_node_health",
"master_netdev",
@@ -355,7 +354,10 @@ class Merger(object):
"tags",
"uid_pool",
"volume_group_name",
- )
+ ]
+ if constants.ENABLE_FILE_STORAGE:
+ check_params.append("file_storage_dir")
+
for param_name in check_params:
my_param = getattr(my_cluster, param_name)
other_param = getattr(other_cluster, param_name)
--
GitLab