opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14494 from ioito/hotfix/qx-cloud-init

Browse Source 
fix(region): user data fix
This commit is contained in:
Zexi Li
2022-06-23 17:01:20 +08:00
committed by GitHub
parent 11e89f6ce2 8cdd9c77eb
commit 8b009591f2
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/guestdrivers/managedvirtual.go
+7 -7
View File
@@ -57,7 +57,12 @@ func (d SManagedVirtualizedGuestDriver) DoScheduleStorageFilter() bool { return
func (d SManagedVirtualizedGuestDriver) DoScheduleCloudproviderTagFilter() bool { return true }
func (self *SManagedVirtualizedGuestDriver) GetJsonDescAtHost(ctx context.Context, userCred mcclient.TokenCredential, guest *models.SGuest, host *models.SHost, params *jsonutils.JSONDict) (jsonutils.JSONObject, error) {
config := cloudprovider.SManagedVMCreateConfig{}
config := cloudprovider.SManagedVMCreateConfig{
IsNeedInjectPasswordByCloudInit: guest.GetDriver().IsNeedInjectPasswordByCloudInit(),
UserDataType: guest.GetDriver().GetUserDataType(),
WindowsUserDataType: guest.GetDriver().GetWindowsUserDataType(),
IsWindowsUserDataTypeNeedEncode: guest.GetDriver().IsWindowsUserDataTypeNeedEncode(),
}
config.Name = guest.Name
config.NameEn = pinyinutils.Text2Pinyin(guest.Name)
config.Hostname = guest.Hostname
@@ -367,12 +372,7 @@ func (self *SManagedVirtualizedGuestDriver) RequestDeployGuestOnHost(ctx context
}
log.Debugf("RequestDeployGuestOnHost: %s", config)
desc := cloudprovider.SManagedVMCreateConfig{
IsNeedInjectPasswordByCloudInit: guest.GetDriver().IsNeedInjectPasswordByCloudInit(),
UserDataType: guest.GetDriver().GetUserDataType(),
WindowsUserDataType: guest.GetDriver().GetWindowsUserDataType(),
IsWindowsUserDataTypeNeedEncode: guest.GetDriver().IsWindowsUserDataTypeNeedEncode(),
}
desc := cloudprovider.SManagedVMCreateConfig{}
err = desc.GetConfig(config)
if err != nil {
return errors.Wrapf(err, "desc.GetConfig")