From 58bad41910970fb3b08aa4d21875af6d04c8bf2e Mon Sep 17 00:00:00 2001 From: Rajani Karuturi Date: Thu, 17 Jul 2014 11:44:26 +0530 Subject: [PATCH] Fixed CLOUDSTACK-6983: unable to register lxc template added a check for tar.gz format in checktemplate --- .../apache/cloudstack/utils/template/TemplateUtils.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/utils/src/org/apache/cloudstack/utils/template/TemplateUtils.java b/utils/src/org/apache/cloudstack/utils/template/TemplateUtils.java index a3f3a682a54..cf1e177e6d4 100644 --- a/utils/src/org/apache/cloudstack/utils/template/TemplateUtils.java +++ b/utils/src/org/apache/cloudstack/utils/template/TemplateUtils.java @@ -61,6 +61,13 @@ public class TemplateUtils { s_logger.debug("File at path " + path + " looks like ova : " + output); return ""; } + + //lxc + if (output.contains("POSIX tar") && isCorrectExtension(url, "tar")) { + s_logger.debug("File at path " + path + " looks like just tar : " + output); + return ""; + } + if (output.contains("ISO 9660") && isCorrectExtension(url, "iso")) { s_logger.debug("File at path " + path + " looks like an iso : " + output); return "";