Updated Branches: refs/heads/object_store e51adc3b7 -> 2616115ff
Still add system vm template to template_store_ref in adding image store, otherwise systemvm cannot come up. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2616115f Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2616115f Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2616115f Branch: refs/heads/object_store Commit: 2616115ff94176e55476a6379d8021aacdbbded9 Parents: e51adc3 Author: Min Chen <min.c...@citrix.com> Authored: Wed May 29 17:27:24 2013 -0700 Committer: Min Chen <min.c...@citrix.com> Committed: Wed May 29 17:27:24 2013 -0700 ---------------------------------------------------------------------- .../src/com/cloud/storage/StorageManagerImpl.java | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2616115f/server/src/com/cloud/storage/StorageManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java index bb613b6..35fa323 100755 --- a/server/src/com/cloud/storage/StorageManagerImpl.java +++ b/server/src/com/cloud/storage/StorageManagerImpl.java @@ -1751,13 +1751,10 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C // trigger system vm template download this._imageSrv.downloadBootstrapSysTemplate(store); } - // for NFS, template store association will be populated in template sync phase - /* else { // populate template_store_ref table this._imageSrv.addSystemVMTemplatesToSecondary(store); } - */ // associate builtin template with zones associated with this image // store
