Commit bb074298 authored by Guido Trotter's avatar Guido Trotter
Browse files

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: default avatarGuido Trotter <ultrotter@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parent e3a19474
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment