Merge remote-tracking branch 'origin/4.18'

Author: yadvr

tools/marvin/marvin/lib/utils.py

@@ -47,7 +47,7 @@ def _configure_ssh_credentials(hypervisor):
 
     if (str(hypervisor).lower() == 'vmware'
         or str(hypervisor).lower() == 'hyperv'):
-        ssh_command = "ssh -i /var/cloudstack/management/.ssh/id_rsa -ostricthostkeychecking=no "
+        ssh_command = "ssh -i ~cloud/.ssh/id_rsa -ostricthostkeychecking=no "
 
     return ssh_command