From 7c62173d3ff4ff44ac5bea69b8a83f3048b63d73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Thu, 21 Sep 2023 20:49:32 +0800 Subject: [PATCH] fix(region): cloudpods userdata (#18118) --- pkg/compute/guestdrivers/cloudpods.go | 4 ++++ pkg/compute/models/server_skus.go | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/compute/guestdrivers/cloudpods.go b/pkg/compute/guestdrivers/cloudpods.go index 23f729b11f..7b591337b7 100644 --- a/pkg/compute/guestdrivers/cloudpods.go +++ b/pkg/compute/guestdrivers/cloudpods.go @@ -92,6 +92,10 @@ func (self *SCloudpodsGuestDriver) IsSupportLiveMigrate() bool { return true } +func (self *SCloudpodsGuestDriver) GetUserDataType() string { + return cloudprovider.CLOUD_SHELL_WITHOUT_ENCRYPT +} + func (self *SCloudpodsGuestDriver) ValidateResizeDisk(guest *models.SGuest, disk *models.SDisk, storage *models.SStorage) error { if guest.GetDiskIndex(disk.Id) <= 0 && guest.Status == api.VM_RUNNING { return httperrors.NewUnsupportOperationError("Cann't online resize root disk") diff --git a/pkg/compute/models/server_skus.go b/pkg/compute/models/server_skus.go index e768dd05a4..912803ade6 100644 --- a/pkg/compute/models/server_skus.go +++ b/pkg/compute/models/server_skus.go @@ -743,7 +743,7 @@ func (manager *SServerSkuManager) ListItemFilter( } if domainStr := query.ProjectDomainId; len(domainStr) > 0 { - domain, err := db.TenantCacheManager.FetchDomainByIdOrName(context.Background(), domainStr) + domain, err := db.TenantCacheManager.FetchDomainByIdOrName(ctx, domainStr) if err != nil { if errors.Cause(err) == sql.ErrNoRows { return nil, httperrors.NewResourceNotFoundError2("domains", domainStr)