You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ke...@apache.org on 2012/05/28 00:30:44 UTC
[26/50] git commit: CS-14937: System VMs and Router VMs does not come
up after upgrading from 3.0 to Bonita
CS-14937: System VMs and Router VMs does not come up after upgrading from 3.0 to Bonita
Description:
Putting in fix for bug 14937. Please note however,
that this fix may be modified later.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/f7797e8b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/f7797e8b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/f7797e8b
Branch: refs/heads/master
Commit: f7797e8b02a87eb70020234c96ddb1f15a59a07d
Parents: 3006bed
Author: Vijayendra Bhamidipati <vi...@citrix.com>
Authored: Thu May 17 18:10:54 2012 -0700
Committer: Vijayendra Bhamidipati <vi...@citrix.com>
Committed: Fri May 25 18:10:18 2012 -0700
----------------------------------------------------------------------
.../hypervisor/vmware/resource/VmwareResource.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f7797e8b/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index e47aee3..55bc0c1 100755
--- a/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -1481,7 +1481,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
s_logger.info("Prepare NIC device based on NicTO: " + _gson.toJson(nicTo));
Pair<ManagedObjectReference, String> networkInfo = prepareNetworkFromNicInfo(vmMo.getRunningHost(), nicTo);
- if (mgr.getNexusVSwitchGlobalParameter()) {
+ if (_nexusVSwitch) {
String dvSwitchUuid;
ManagedObjectReference dcMor = hyperHost.getHyperHostDatacenter();
DatacenterMO dataCenterMo = new DatacenterMO(context, dcMor);