Skip to content

Commit 2c89797

Browse files
authored
[crmsh-4.5] Fix: bootstrap: Local joining node should be included when merging known_hosts (bsc#1229419) (#1641)
backport #1639
2 parents d12f04c + fd14bf6 commit 2c89797

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

crmsh/bootstrap.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1824,10 +1824,7 @@ def join_ssh_merge(cluster_node, remote_user):
18241824
"""
18251825
logger.info("Merging known_hosts")
18261826

1827-
hosts = utils.list_cluster_nodes()
1828-
if hosts is None:
1829-
hosts = list()
1830-
hosts.append(cluster_node)
1827+
hosts = _context.node_list_in_cluster + [utils.this_node()]
18311828

18321829
# To create local entry in known_hosts
18331830
rc, _, _ = utils.get_stdout_stderr_as_local_sudoer("ssh {} {} true".format(SSH_OPTION, utils.this_node()))
@@ -1836,7 +1833,6 @@ def join_ssh_merge(cluster_node, remote_user):
18361833
known_hosts_new: set[str] = set()
18371834

18381835
cat_cmd = "[ -e ~/.ssh/known_hosts ] && cat ~/.ssh/known_hosts || true"
1839-
#logger_utils.log_only_to_file("parallax.call {} : {}".format(hosts, cat_cmd))
18401836
for host in hosts:
18411837
known_hosts_content = utils.get_stdout_or_raise_error(cat_cmd, remote=host)
18421838
if known_hosts_content:

0 commit comments

Comments
 (0)