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 {