From b67a832f7722bfd42670456a4cdfa180662b60f8 Mon Sep 17 00:00:00 2001
From: Min Chen <min.chen@citrix.com>
Date: Tue, 27 Aug 2013 17:15:11 -0700
Subject: [PATCH] CLOUDSTACK-4530:Create Template from a Snapshot fails with
 unable to find any snapshot ova/ovf when we have multiple secondary storage
 for a zone.

---
 server/src/com/cloud/template/TemplateManagerImpl.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java
index f6ae0cbf994..e085be621a0 100755
--- a/server/src/com/cloud/template/TemplateManagerImpl.java
+++ b/server/src/com/cloud/template/TemplateManagerImpl.java
@@ -1347,6 +1347,10 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
             AsyncCallFuture<TemplateApiResult> future = null;
             if (snapshotId != null) {
                 SnapshotInfo snapInfo = _snapshotFactory.getSnapshot(snapshotId, DataStoreRole.Image);
+                DataStore snapStore = snapInfo.getDataStore();
+                if (snapStore != null) {
+                    store = snapStore; // pick snapshot image store to create template
+                }
                 future = _tmpltSvr.createTemplateFromSnapshotAsync(snapInfo, tmplInfo, store);
             } else if (volumeId != null) {
                 VolumeInfo volInfo = _volFactory.getVolume(volumeId);