Updated Branches: refs/heads/master-6-17-stable 69eeaf36a -> bbc4e1212
Cloudstack-3302 VM deployement failed in VMWare due to dnsmasq configuration issue in case of multiple subnets in a vlan Signed-off-by: Abhinandan Prateek <aprat...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bbc4e121 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bbc4e121 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bbc4e121 Branch: refs/heads/master-6-17-stable Commit: bbc4e1212b1fd2432143c2f1dc7a1c57e6512cbf Parents: 69eeaf3 Author: Bharat Kumar <bharat.ku...@citrix.com> Authored: Mon Jul 1 18:26:26 2013 +0530 Committer: Abhinandan Prateek <aprat...@apache.org> Committed: Tue Jul 2 11:54:12 2013 +0530 ---------------------------------------------------------------------- .../com/cloud/hypervisor/vmware/resource/VmwareResource.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bbc4e121/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 2dcc72c..3325171 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 @@ -2077,7 +2077,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa protected Answer execute(final DnsMasqConfigCommand cmd) { if (s_logger.isInfoEnabled()) { - s_logger.info("Executing deleteipAlias command: " + _gson.toJson(cmd)); + s_logger.info("Executing dnsmasqConfig command: " + _gson.toJson(cmd)); } String routerIp = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP); String controlIp = getRouterSshControlIp(cmd); @@ -2103,7 +2103,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, "scp" + tmpConfigFilePath + " /root/dnsmasq.sh"); if (s_logger.isDebugEnabled()) { s_logger.debug("Run command on domain router " + routerIp + ", /root/dnsmasq.sh"); } @@ -2123,7 +2123,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa return new Answer(cmd); } catch (Throwable e) { s_logger.error("Unexpected exception: " + e.toString(), e); - return new Answer(cmd, false, "LoadBalancerConfigCommand failed due to " + VmwareHelper.getExceptionMessage(e)); + return new Answer(cmd, false, " DnsmasqConfig command failed due to " + VmwareHelper.getExceptionMessage(e)); } }
