opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 10:46:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

避免创建Windows时使用linux格式的userData

Browse Source
This commit is contained in:
ioito
2019-04-18 16:14:46 +08:00
parent 731844785f
commit 179d60fe0f
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudprovider/instance.go
+12 -8
View File
@@ -16,6 +16,7 @@ package cloudprovider
import (
"yunion.io/x/jsonutils"
"yunion.io/x/pkg/util/osprofile"
"yunion.io/x/onecloud/pkg/util/ansible"
"yunion.io/x/onecloud/pkg/util/billing"
@@ -66,16 +67,19 @@ func (vmConfig *SManagedVMCreateConfig) GetConfig(config *jsonutils.JSONDict) er
if publicKey, _ := config.GetString("public_key"); len(publicKey) > 0 {
vmConfig.PublicKey = publicKey
}
if userDataType, _ := config.GetString("user_data_type"); len(userDataType) > 0 {
vmConfig.UserDataType = userDataType
//目前所写的userData格式仅支持Linux
if vmConfig.OsType == osprofile.OS_TYPE_LINUX {
if userDataType, _ := config.GetString("user_data_type"); len(userDataType) > 0 {
vmConfig.UserDataType = userDataType
}
adminPublicKey, _ := config.GetString("admin_public_key")
projectPublicKey, _ := config.GetString("project_public_key")
oUserData, _ := config.GetString("user_data")
vmConfig.UserData = generateUserData(adminPublicKey, projectPublicKey, oUserData, vmConfig.UserDataType)
}
adminPublicKey, _ := config.GetString("admin_public_key")
projectPublicKey, _ := config.GetString("project_public_key")
oUserData, _ := config.GetString("user_data")
vmConfig.UserData = generateUserData(adminPublicKey, projectPublicKey, oUserData, vmConfig.UserDataType)
resetPassword := jsonutils.QueryBoolean(config, "reset_password", false)
vmConfig.Password, _ = config.GetString("password")
if resetPassword && len(vmConfig.Password) == 0 {