From 129ed08a5cae95f1ce057a96f911e75bc0cfe465 Mon Sep 17 00:00:00 2001 From: Qu Xuan Date: Wed, 15 Jan 2020 17:56:57 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=81=BF=E5=85=8D=E5=88=9B=E5=BB=BAazur?= =?UTF-8?q?e=E6=97=B6=E6=8C=87=E5=AE=9A=E9=AB=98=E7=BA=A7ssd=E5=A4=B1?= =?UTF-8?q?=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/multicloud/azure/host.go | 2 +- pkg/multicloud/azure/instance.go | 1 - pkg/multicloud/azure/storage.go | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pkg/multicloud/azure/host.go b/pkg/multicloud/azure/host.go index 165884606a..63d352daae 100644 --- a/pkg/multicloud/azure/host.go +++ b/pkg/multicloud/azure/host.go @@ -173,7 +173,7 @@ func (self *SHost) _createVM(desc *cloudprovider.SManagedVMCreateConfig, nicId s Name: fmt.Sprintf("vdisk_%s_%d", desc.Name, time.Now().UnixNano()), Caching: "ReadWrite", ManagedDisk: &ManagedDiskParameters{ - StorageAccountType: storage.Name, + StorageAccountType: storage.storageType, }, CreateOption: "FromImage", DiskSizeGB: &sysDiskSize, diff --git a/pkg/multicloud/azure/instance.go b/pkg/multicloud/azure/instance.go index 8b7b5ac9b8..b3cb3530ab 100644 --- a/pkg/multicloud/azure/instance.go +++ b/pkg/multicloud/azure/instance.go @@ -355,7 +355,6 @@ func (self *SInstance) getStorageInfoByUri(uri string) (*SStorage, *SClassicStor if storageaccounts[i].Name == storageName { storage := SStorage{ zone: self.host.zone, - Name: storageName, storageType: storageaccounts[i].Sku.Name, } return &storage, nil, nil diff --git a/pkg/multicloud/azure/storage.go b/pkg/multicloud/azure/storage.go index 5e4aa86287..2821bb0b1a 100644 --- a/pkg/multicloud/azure/storage.go +++ b/pkg/multicloud/azure/storage.go @@ -36,7 +36,6 @@ type SStorage struct { zone *SZone storageType string - Name string ResourceType string Tier string Kind string