You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2013/12/22 17:59:02 UTC
[7/7] git commit: updated refs/heads/4.3 to 58aaf67
CLOUDSTACK-5584 fix the issue to configure the systemvm's in hyperv consistently
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/58aaf678
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/58aaf678
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/58aaf678
Branch: refs/heads/4.3
Commit: 58aaf6780601117367bdb8d8b7ffec57776c398f
Parents: ad8edbf
Author: Rajesh Battala <ra...@citrix.com>
Authored: Sun Dec 22 22:15:29 2013 +0530
Committer: Rajesh Battala <ra...@citrix.com>
Committed: Sun Dec 22 22:15:29 2013 +0530
----------------------------------------------------------------------
.../DotNet/ServerResource/HypervResource/WmiCallsV2.cs | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/58aaf678/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
index 2248afa..6eb8353 100644
--- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
+++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
@@ -445,13 +445,6 @@ namespace HypervResource
String bootargs = bootArgs;
AddUserData(vm, bootargs);
-
- // Get existing KVP
- //var vmSettings = GetVmSettings(vm);
- //var kvpInfo = GetKvpSettings(vmSettings);
- //logger.DebugFormat("Boot Args presisted on the VM are ", kvpInfo);
- //AddUserData(vm, bootargs);
-
// Verify key added to subsystem
//kvpInfo = GetKvpSettings(vmSettings);
@@ -475,17 +468,16 @@ namespace HypervResource
if (vmName.StartsWith("r-") || vmName.StartsWith("s-") || vmName.StartsWith("v-"))
{
System.Threading.Thread.Sleep(90000);
- SetState(newVm, RequiredState.Reset);
// wait for the second boot and then return with sucesss
//if publicIPAddress is empty or null don't ping the ip
- if (publicIpAddress.Equals("") == true)
+ /*if (publicIpAddress.Equals("") == true)
{
System.Threading.Thread.Sleep(90000);
}
else
{
pingResource(publicIpAddress);
- }
+ }*/
}
logger.InfoFormat("Started VM {0}", vmName);
return newVm;