From cce9fab01af7a68836bb6b3b48b0ff289526d441 Mon Sep 17 00:00:00 2001 From: Qu Xuan Date: Tue, 31 Dec 2019 18:55:03 +0800 Subject: [PATCH] fix: openstack image: vmdk -> qcow2 --- pkg/multicloud/openstack/image.go | 3 ++- pkg/multicloud/openstack/storagecache.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/multicloud/openstack/image.go b/pkg/multicloud/openstack/image.go index 08bb1a5a78..9260d32534 100644 --- a/pkg/multicloud/openstack/image.go +++ b/pkg/multicloud/openstack/image.go @@ -29,6 +29,7 @@ import ( api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/util/imagetools" + "yunion.io/x/onecloud/pkg/util/qemuimg" ) const ( @@ -268,7 +269,7 @@ func (region *SRegion) GetImageByName(name string) (*SImage, error) { func (region *SRegion) CreateImage(imageName string, osType string, osDist string, minDiskGb int, minRam int) (*SImage, error) { params := map[string]interface{}{ "container_format": "bare", - "disk_format": "vmdk", + "disk_format": string(qemuimg.QCOW2), "name": imageName, "min_disk": minDiskGb, "min_ram": minRam, diff --git a/pkg/multicloud/openstack/storagecache.go b/pkg/multicloud/openstack/storagecache.go index 2e0e78554e..4579603474 100644 --- a/pkg/multicloud/openstack/storagecache.go +++ b/pkg/multicloud/openstack/storagecache.go @@ -119,7 +119,7 @@ func (cache *SStoragecache) UploadImage(ctx context.Context, userCred mcclient.T func (cache *SStoragecache) uploadImage(ctx context.Context, userCred mcclient.TokenCredential, image *cloudprovider.SImageCreateOption, isForce bool) (string, error) { s := auth.GetAdminSession(ctx, options.Options.Region, "") - meta, reader, _, err := modules.Images.Download(s, image.ImageId, string(qemuimg.VMDK), false) + meta, reader, _, err := modules.Images.Download(s, image.ImageId, string(qemuimg.QCOW2), false) if err != nil { return "", err }