You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ya...@apache.org on 2013/07/24 23:00:13 UTC
[2/4] git commit: updated refs/heads/4.2 to 42346cd
CLOUDSTACK-3302: [Multiple_IP_Ranges][VmWare] VM deployement failed due to dnsmasq configuration issue in case of multiple subnets in a vlan
Signed-off-by: Abhinandan Prateek <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d09a0880
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d09a0880
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d09a0880
Branch: refs/heads/4.2
Commit: d09a088093568f167921597825110d5517ac535b
Parents: 3673db2
Author: Harikrishna Patnala <ha...@citrix.com>
Authored: Wed Jul 3 16:30:26 2013 +0530
Committer: Sheng Yang <sh...@citrix.com>
Committed: Wed Jul 24 13:59:58 2013 -0700
----------------------------------------------------------------------
.../src/com/cloud/hypervisor/vmware/resource/VmwareResource.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d09a0880/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 64e1f5f..8c5080e 100755
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -2155,7 +2155,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
try {
- Pair<Boolean, String> result = SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "scp" + tmpConfigFilePath + " /root/dnsmasq.sh");
+ Pair<Boolean, String> result = SshHelper.sshExecute(controlIp, DEFAULT_DOMR_SSHPORT, "root", mgr.getSystemVMKeyFile(), null, "/root/dnsmasq.sh " + tmpConfigFilePath);
if (s_logger.isDebugEnabled()) {
s_logger.debug("Run command on domain router " + routerIp + ", /root/dnsmasq.sh");
}