From deca4337c50b14a6a3975b1d8a3f05fdef0f60d6 Mon Sep 17 00:00:00 2001 From: alena Date: Tue, 5 Jul 2011 13:35:29 -0700 Subject: [PATCH] Fixed deployVm with sshKeyPair via 8096 port - take account info from the vm's owner, not from the caller --- server/src/com/cloud/vm/UserVmManagerImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 5f482aafaaf..e8fed8a7168 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -2436,8 +2436,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager // Find an SSH public key corresponding to the key pair name, if one is given String sshPublicKey = null; if (sshKeyPair != null && !sshKeyPair.equals("")) { - Account account = UserContext.current().getCaller(); - SSHKeyPair pair = _sshKeyPairDao.findByName(account.getAccountId(), account.getDomainId(), sshKeyPair); + SSHKeyPair pair = _sshKeyPairDao.findByName(owner.getAccountId(), owner.getDomainId(), sshKeyPair); if (pair == null) { throw new InvalidParameterValueException("A key pair with name '" + sshKeyPair + "' was not found."); }