Updated Branches: refs/heads/4.2 02921b5d7 -> 9505523ec
CLOUDSTACK-4298: in case both xenserver/vmware mixed in one zone, need to make sure, ssvm is loaded with premiumsecondaryresource Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9505523e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9505523e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9505523e Branch: refs/heads/4.2 Commit: 9505523ecaab50a16a87fa837236e864317c2026 Parents: d1c0860 Author: Edison Su <[email protected]> Authored: Tue Aug 13 14:38:28 2013 -0700 Committer: Edison Su <[email protected]> Committed: Tue Aug 13 14:39:01 2013 -0700 ---------------------------------------------------------------------- .../storage/secondary/SecondaryStorageManagerImpl.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9505523e/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java index c417068..52789a1 100755 --- a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java +++ b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java @@ -1056,13 +1056,8 @@ public class SecondaryStorageManagerImpl extends ManagerBase implements Secondar buf.append(" guid=").append(profile.getVirtualMachine().getHostName()); if (_configDao.isPremium()) { - if (profile.getHypervisorType() == HypervisorType.VMware) { - s_logger.debug("VmWare hypervisor configured, telling the ssvm to load the PremiumSecondaryStorageResource"); - buf.append(" resource=com.cloud.storage.resource.PremiumSecondaryStorageResource"); - } else { - s_logger.debug("Telling the ssvm to load the NfsSecondaryStorageResource"); - buf.append(" resource=org.apache.cloudstack.storage.resource.NfsSecondaryStorageResource"); - } + s_logger.debug("VmWare hypervisor configured, telling the ssvm to load the PremiumSecondaryStorageResource"); + buf.append(" resource=com.cloud.storage.resource.PremiumSecondaryStorageResource"); } else { buf.append(" resource=org.apache.cloudstack.storage.resource.NfsSecondaryStorageResource"); }
