Merge pull request #1247 from liangxin1300/20230921_user_of_sudoer_crmsh46

[crmsh-4.6] Fix: utils: Add 'sudo' only when there is a sudoer(bsc#1215549)

Author: liangxin1300

crmsh/report/utillib.py

@@ -1374,7 +1374,7 @@ def start_slave_collector(node, arg_str):
                     logger.warning(err)
                 break
         if err:
-            print(err)
+            print(err, file=sys.stderr)
 
     if out == '': # if we couldn't get anything
         return

crmsh/user_of_host.py

@@ -98,7 +98,10 @@ def _get_user_of_host_from_config(host):
     def _guess_user_for_ssh(host: str) -> typing.Tuple[str, str]:
         args = ['ssh']
         args.extend(constants.SSH_OPTION_ARGS)
-        args.extend(['-o', 'BatchMode=yes', host, 'sudo', 'true'])
+        if userdir.get_sudoer():
+            args.extend(['-o', 'BatchMode=yes', host, 'sudo', 'true'])
+        else:
+            args.extend(['-o', 'BatchMode=yes', host, 'true'])
         rc = subprocess.call(
             args,
             stdin=subprocess.DEVNULL,

test/features/cluster_api.feature

@@ -18,11 +18,11 @@ Feature: Functional test to cover SAP clusterAPI
     And     Wait "3" seconds
     Then    Resource "d" type "Dummy" is "Started"
     And     Show cluster status on "hanode1"
+    When    Run "echo 'export PATH=$PATH:/usr/sbin/' > ~hacluster/.bashrc" on "hanode1"
+    When    Run "echo 'export PATH=$PATH:/usr/sbin/' > ~hacluster/.bashrc" on "hanode2"
 
   @clean
   Scenario: Start and stop resource by hacluster
-    When    Run "echo 'export PATH=$PATH:/usr/sbin/' >> ~hacluster/.bashrc" on "hanode1"
-    When    Run "echo 'export PATH=$PATH:/usr/sbin/' >> ~hacluster/.bashrc" on "hanode2"
     When    Run "su - hacluster -c 'crm resource stop d'" on "hanode1"
     Then    Expected return code is "0"
     When    Wait "3" seconds