Updated Branches:
  refs/heads/master-6-17-stable 6f86b6b73 -> 7d72966e4


CLOUDSTACK-1758: Update ssh key location for vmware

Signed-off-by: Prasanna Santhanam <[email protected]>
(cherry picked from commit 6e63bb78220a057bca329ee6a8779f0e4c476586)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7d72966e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7d72966e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7d72966e

Branch: refs/heads/master-6-17-stable
Commit: 7d72966e45d3e2f122d5b3d44e9e300bf017a593
Parents: 6f86b6b
Author: Girish Shilamkar <[email protected]>
Authored: Wed Jun 19 12:10:09 2013 +0530
Committer: Prasanna Santhanam <[email protected]>
Committed: Sun Jun 30 20:10:30 2013 +0530

----------------------------------------------------------------------
 tools/marvin/marvin/integration/lib/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7d72966e/tools/marvin/marvin/integration/lib/utils.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/utils.py 
b/tools/marvin/marvin/integration/lib/utils.py
index 6892c41..839ec89 100644
--- a/tools/marvin/marvin/integration/lib/utils.py
+++ b/tools/marvin/marvin/integration/lib/utils.py
@@ -160,7 +160,7 @@ def get_process_status(hostip, port, username, password, 
linklocalip, process, h
     #SSH to the machine
     ssh = remoteSSHClient(hostip, port, username, password)
     if str(hypervisor).lower() == 'vmware':
-        ssh_command = "ssh -i /var/lib/cloud/management/.ssh/id_rsa 
-ostricthostkeychecking=no "
+        ssh_command = "ssh -i /var/cloudstack/management/.ssh/id_rsa 
-ostricthostkeychecking=no "
     else:
         ssh_command = "ssh -i ~/.ssh/id_rsa.cloud -ostricthostkeychecking=no "
 

Reply via email to