Merge pull request #1137 from liangxin1300/20230302_sudo_crm_node

Dev: bootstrap: Add sudo before crm_node under non-root user on remote node

Author: liangxin1300

crmsh/bootstrap.py

@@ -1927,7 +1927,7 @@ def setup_passwordless_with_other_nodes(init_node):
     # Fetch cluster nodes list
     remote_user = _context.user_list[0]
     local_user = _context.current_user
-    cmd = 'ssh {} {}@{} PATH=\\"\\$PATH\\":/usr/sbin:/sbin crm_node -l'.format(SSH_OPTION, remote_user, init_node)
+    cmd = f'ssh {SSH_OPTION} {remote_user}@{init_node} sudo crm_node -l'
     rc, out, err = utils.su_get_stdout_stderr(local_user, cmd)
     if rc != 0:
         utils.fatal("Can't fetch cluster nodes list from {}: {}".format(init_node, err))

test/unittests/test_bootstrap.py

@@ -561,7 +561,7 @@ def test_setup_passwordless_with_other_nodes_failed_fetch_nodelist(self, mock_ru
         with self.assertRaises(SystemExit):
             bootstrap.setup_passwordless_with_other_nodes("node1")
 
-        mock_run.assert_called_once_with('carol', 'ssh {} alice@node1 PATH=\\"\\$PATH\\":/usr/sbin:/sbin crm_node -l'.format(constants.SSH_OPTION))
+        mock_run.assert_called_once_with('carol', 'ssh {} alice@node1 sudo crm_node -l'.format(constants.SSH_OPTION))
         mock_error.assert_called_once_with("Can't fetch cluster nodes list from node1: None")
 
     @mock.patch('crmsh.utils.fatal')
@@ -589,7 +589,7 @@ def test_setup_passwordless_with_other_nodes_failed_fetch_hostname(
             bootstrap.setup_passwordless_with_other_nodes("node1")
 
         mock_run.assert_has_calls([
-            mock.call('carol', 'ssh {} alice@node1 PATH=\\"\\$PATH\\":/usr/sbin:/sbin crm_node -l'.format(constants.SSH_OPTION)),
+            mock.call('carol', 'ssh {} alice@node1 sudo crm_node -l'.format(constants.SSH_OPTION)),
             mock.call('carol', 'ssh {} alice@node1 hostname'.format(constants.SSH_OPTION))
         ])
         mock_error.assert_called_once_with("Can't fetch hostname of node1: None")
@@ -623,7 +623,7 @@ def test_setup_passwordless_with_other_nodes(
         bootstrap.setup_passwordless_with_other_nodes("node1")
 
         mock_run.assert_has_calls([
-            mock.call('carol', 'ssh {} alice@node1 PATH=\\"\\$PATH\\":/usr/sbin:/sbin crm_node -l'.format(constants.SSH_OPTION)),
+            mock.call('carol', 'ssh {} alice@node1 sudo crm_node -l'.format(constants.SSH_OPTION)),
             mock.call('carol', 'ssh {} alice@node1 hostname'.format(constants.SSH_OPTION))
             ])
         mock_userof.assert_called_once_with("node2")