From d970c13cf2bb85ed6030a922a9084acfbc54fce4 Mon Sep 17 00:00:00 2001 From: alena Date: Tue, 19 Jul 2011 09:48:45 -0700 Subject: [PATCH] bug 10417: Basic zone - send vm data info only to the dhcp server in the same pod status 10417: resolved fixed Conflicts: server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java --- .../network/router/VirtualNetworkApplianceManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index 5dabe6dcc4e..2339e819536 100755 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -1390,7 +1390,7 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian cmds.addCommand("dhcp", dhcpCommand); } - + if (sendPasswordAndVmData) { String password = (String) profile.getParameter(VirtualMachineProfile.Param.VmPassword); String userData = profile.getVirtualMachine().getUserData();