From bfeebfdc8bd140cd50d787f9b943c0d10f512dc8 Mon Sep 17 00:00:00 2001
From: ioito <qu_xuan@icloud.com>
Date: Mon, 3 Jun 2019 16:25:25 +0800
Subject: [PATCH] =?UTF-8?q?=E9=81=BF=E5=85=8D=E7=BA=A7=E8=81=94=E9=95=9C?=
 =?UTF-8?q?=E5=83=8F=E5=88=86=E7=B1=BB=E4=B8=8D=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/util/openstack/image.go | 5 +++++
 pkg/util/zstack/image.go    | 8 +++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkg/util/openstack/image.go b/pkg/util/openstack/image.go
index 4902415932..f3ec3f0800 100644
--- a/pkg/util/openstack/image.go
+++ b/pkg/util/openstack/image.go
@@ -24,6 +24,7 @@ import (
 
 	api "yunion.io/x/onecloud/pkg/apis/compute"
 	"yunion.io/x/onecloud/pkg/cloudprovider"
+	"yunion.io/x/onecloud/pkg/util/imagetools"
 )
 
 const (
@@ -167,6 +168,10 @@ func (image *SImage) GetOsType() string {
 }
 
 func (image *SImage) GetOsDist() string {
+	osDist := imagetools.NormalizeImageInfo(image.Name, "", "", "", "").OsDistro
+	if len(osDist) > 0 {
+		return osDist
+	}
 	return "Linux"
 }
 
diff --git a/pkg/util/zstack/image.go b/pkg/util/zstack/image.go
index 4f287b8d19..56f6f46628 100644
--- a/pkg/util/zstack/image.go
+++ b/pkg/util/zstack/image.go
@@ -22,6 +22,8 @@ import (
 	"sort"
 	"time"
 
+	"yunion.io/x/onecloud/pkg/util/imagetools"
+
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/log"
 	"yunion.io/x/onecloud/pkg/cloudprovider"
@@ -137,7 +139,11 @@ func (image *SImage) GetOsType() string {
 }
 
 func (image *SImage) GetOsDist() string {
-	return ""
+	osDist := imagetools.NormalizeImageInfo(image.URL, "", "", "", "").OsDistro
+	if len(osDist) > 0 {
+		return osDist
+	}
+	return image.Platform
 }
 
 func (image *SImage) GetOsVersion() string {