From a636ee4dab800713c71b0c2bb48e29624525ba98 Mon Sep 17 00:00:00 2001 From: Min Chen Date: Mon, 14 Apr 2014 14:41:50 -0700 Subject: [PATCH] CLOUDSTACK-5960: Remove another check preventing Domain admin and normal user from registering template in S3. --- server/src/com/cloud/template/TemplateAdapterBase.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/server/src/com/cloud/template/TemplateAdapterBase.java b/server/src/com/cloud/template/TemplateAdapterBase.java index 346517475e3..c84132d59e3 100755 --- a/server/src/com/cloud/template/TemplateAdapterBase.java +++ b/server/src/com/cloud/template/TemplateAdapterBase.java @@ -179,7 +179,7 @@ public abstract class TemplateAdapterBase extends AdapterBase implements Templat if (!isAdmin && zoneId == null && !isRegionStore ) { // domain admin and user should also be able to register template on a region store - throw new InvalidParameterValueException("Please specify a valid zone Id."); + throw new InvalidParameterValueException("Please specify a valid zone Id. Only admins can create templates in all zones."); } if (url.toLowerCase().contains("file://")) { @@ -209,10 +209,6 @@ public abstract class TemplateAdapterBase extends AdapterBase implements Templat _resourceLimitMgr.checkResourceLimit(templateOwner, ResourceType.template); - if (!_accountMgr.isRootAdmin(templateOwner.getId()) && zoneId == null) { - throw new IllegalArgumentException("Only admins can create templates in all zones"); - } - // If a zoneId is specified, make sure it is valid if (zoneId != null) { DataCenterVO zone = _dcDao.findById(zoneId);