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

aws userdata bugfix

Browse Source
This commit is contained in:
tangbin
2020-02-14 19:36:13 +08:00
parent c85a8d354e
commit 08d412669d
7 changed files with 87 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/apis/compute/guest_const.go
+4 -3
View File
@@ -229,9 +229,10 @@ var HOSTTYPE_HYPERVISOR = map[string]string{
}
const (
VM_AWS_DEFAULT_LOGIN_USER = "ec2user"
VM_AZURE_DEFAULT_LOGIN_USER = "toor"
VM_ZSTACK_DEFAULT_LOGIN_USER = "root"
VM_AWS_DEFAULT_LOGIN_USER = "ec2user"
VM_AWS_DEFAULT_WINDOWS_LOGIN_USER = "Administrator"
VM_AZURE_DEFAULT_LOGIN_USER = "toor"
VM_ZSTACK_DEFAULT_LOGIN_USER = "root"
VM_METADATA_APP_TAGS = "app_tags"
VM_METADATA_CREATE_PARAMS = "create_params"
pkg/cloudprovider/instance.go
+2 -2
View File
@@ -115,7 +115,7 @@ func generateUserData(adminPublicKey, projectPublicKey, oUserData string) string
cloudConfig := cloudinit.SCloudConfig{
DisableRoot: 0,
SshPwauth: 1,
SshPwauth: cloudinit.SSH_PASSWORD_AUTH_ON,
Users: []cloudinit.SUser{
ansibleUser,
@@ -141,7 +141,7 @@ func (vmConfig *SManagedVMCreateConfig) InjectPasswordByCloudInit() error {
cloudconfig := cloudinit.SCloudConfig{
DisableRoot: 0,
SshPwauth: 1,
SshPwauth: cloudinit.SSH_PASSWORD_AUTH_ON,
Users: []cloudinit.SUser{
loginUser,
},
pkg/compute/guestdrivers/aws.go
+1 -1
View File
@@ -81,7 +81,7 @@ func (self *SAwsGuestDriver) IsNeedInjectPasswordByCloudInit(desc *cloudprovider
func (self *SAwsGuestDriver) GetLinuxDefaultAccount(desc cloudprovider.SManagedVMCreateConfig) string {
// return fetchAwsUserName(desc)
if desc.OsType == "Windows" {
return "Administrator"
return api.VM_AWS_DEFAULT_WINDOWS_LOGIN_USER
}
return api.VM_AWS_DEFAULT_LOGIN_USER
pkg/multicloud/aws/host.go
+9
View File
@@ -15,10 +15,13 @@
package aws
import (
"encoding/base64"
"fmt"
"strings"
"yunion.io/x/jsonutils"
"yunion.io/x/log"
"yunion.io/x/pkg/util/osprofile"
api "yunion.io/x/onecloud/pkg/apis/compute"
"yunion.io/x/onecloud/pkg/cloudprovider"
@@ -173,6 +176,12 @@ func (self *SHost) GetInstanceById(instanceId string) (*SInstance, error) {
}
func (self *SHost) CreateVM(desc *cloudprovider.SManagedVMCreateConfig) (cloudprovider.ICloudVM, error) {
if strings.ToLower(desc.OsType) == strings.ToLower(osprofile.OS_TYPE_WINDOWS) {
// powershell scripts
data := fmt.Sprintf("<powershell>%s</powershell>", desc.UserData)
desc.UserData = base64.StdEncoding.EncodeToString([]byte(data))
}
vmId, err := self._createVM(desc.Name, desc.ExternalImageId, desc.SysDisk, desc.InstanceType, desc.ExternalNetworkId, desc.IpAddr, desc.Description, desc.Password, desc.DataDisks, desc.PublicKey, desc.ExternalSecgroupId, desc.UserData)
if err != nil {
return nil, err
pkg/multicloud/aws/instance.go
+64 -28
View File
@@ -410,32 +410,6 @@ func (self *SInstance) RebuildRoot(ctx context.Context, desc *cloudprovider.SMan
return "", err
}
var cloudconfig *cloudinit.SCloudConfig
if len(udata) == 0 {
cloudconfig = &cloudinit.SCloudConfig{}
} else {
cloudconfig, err = cloudinit.ParseUserDataBase64(udata)
if err != nil {
log.Debugf("RebuildRoot invalid instance user data %s", udata)
return "", fmt.Errorf("RebuildRoot invalid instance user data %s", err)
}
}
keypairName := self.KeyPairName
loginUser := cloudinit.NewUser(api.VM_AWS_DEFAULT_LOGIN_USER)
loginUser.SudoPolicy(cloudinit.USER_SUDO_NOPASSWD)
if len(desc.PublicKey) > 0 {
loginUser.SshKey(desc.PublicKey)
cloudconfig.MergeUser(loginUser)
keypairName, err = self.host.zone.region.syncKeypair(desc.PublicKey)
if err != nil {
return "", fmt.Errorf("RebuildRoot.syncKeypair %s", err)
}
} else if len(desc.Password) > 0 {
loginUser.Password(desc.Password)
cloudconfig.MergeUser(loginUser)
}
// compare sysSizeGB
image, err := self.host.zone.region.GetImage(desc.ImageId)
if err != nil {
@@ -447,7 +421,65 @@ func (self *SInstance) RebuildRoot(ctx context.Context, desc *cloudprovider.SMan
}
}
diskId, err := self.host.zone.region.ReplaceSystemDisk(ctx, self.InstanceId, desc.ImageId, desc.SysSizeGB, keypairName, cloudconfig.UserDataBase64())
// upload keypair
keypairName := self.KeyPairName
if len(desc.PublicKey) > 0 {
keypairName, err = self.host.zone.region.syncKeypair(desc.PublicKey)
if err != nil {
return "", fmt.Errorf("RebuildRoot.syncKeypair %s", err)
}
}
userdata := ""
srcOsType := strings.ToLower(self.GetOSType())
destOsType := strings.ToLower(image.GetOsType())
winOS := strings.ToLower(osprofile.OS_TYPE_WINDOWS)
cloudconfig := &cloudinit.SCloudConfig{}
if srcOsType != winOS && len(udata) > 0 {
_cloudconfig, err := cloudinit.ParseUserDataBase64(udata)
if err != nil {
// 忽略无效的用户数据
log.Debugf("RebuildRoot invalid instance user data %s", udata)
} else {
cloudconfig = _cloudconfig
}
}
if (srcOsType != winOS && destOsType != winOS) || (srcOsType == winOS && destOsType != winOS) {
// linux/windows to linux
loginUser := cloudinit.NewUser(api.VM_AWS_DEFAULT_LOGIN_USER)
loginUser.SudoPolicy(cloudinit.USER_SUDO_NOPASSWD)
if len(desc.PublicKey) > 0 {
loginUser.SshKey(desc.PublicKey)
cloudconfig.MergeUser(loginUser)
} else if len(desc.Password) > 0 {
cloudconfig.SshPwauth = cloudinit.SSH_PASSWORD_AUTH_ON
loginUser.Password(desc.Password)
cloudconfig.MergeUser(loginUser)
}
userdata = cloudconfig.UserDataBase64()
} else {
// linux/windows to windows
data := ""
if len(desc.Password) > 0 {
cloudconfig.SshPwauth = cloudinit.SSH_PASSWORD_AUTH_ON
loginUser := cloudinit.NewUser(api.VM_AWS_DEFAULT_WINDOWS_LOGIN_USER)
loginUser.SudoPolicy(cloudinit.USER_SUDO_NOPASSWD)
loginUser.Password(desc.Password)
cloudconfig.MergeUser(loginUser)
data = fmt.Sprintf("<powershell>%s</powershell>", cloudconfig.UserDataPowerShell())
} else {
if len(udata) > 0 {
data = fmt.Sprintf("<powershell>%s</powershell>", udata)
}
}
userdata = base64.StdEncoding.EncodeToString([]byte(data))
}
diskId, err := self.host.zone.region.ReplaceSystemDisk(ctx, self.InstanceId, desc.ImageId, desc.SysSizeGB, keypairName, userdata)
if err != nil {
return "", err
}
@@ -985,7 +1017,11 @@ func (self *SRegion) ReplaceSystemDisk(ctx context.Context, instanceId string, i
self.ec2Client.WaitUntilInstanceStopped(&ec2.DescribeInstancesInput{InstanceIds: []*string{&instanceId}})
self.ec2Client.WaitUntilVolumeInUse(&ec2.DescribeVolumesInput{VolumeIds: []*string{&tempInstance.Disks[0]}})
err = instance.UpdateUserData(userdata)
userdataText, err := base64.StdEncoding.DecodeString(userdata)
if err != nil {
return "", errors.Wrap(err, "SRegion.ReplaceSystemDisk.DecodeString")
}
err = instance.UpdateUserData(string(userdataText))
if err != nil {
log.Debugf("ReplaceSystemDisk update user data %s", err)
return "", fmt.Errorf("ReplaceSystemDisk update user data failed")
pkg/util/cloudinit/cloudconfig.go
+6 -1
View File
@@ -34,6 +34,7 @@ import (
*/
type TSudoPolicy string
type TSshPwauth string
const (
CLOUD_CONFIG_HEADER = "#cloud-config\n"
@@ -43,6 +44,10 @@ const (
USER_SUDO = TSudoPolicy("sudo")
USER_SUDO_DENY = TSudoPolicy("sudo_deny")
USER_SUDO_NONE = TSudoPolicy("")
SSH_PASSWORD_AUTH_ON = TSshPwauth("true")
SSH_PASSWORD_AUTH_OFF = TSshPwauth("false")
SSH_PASSWORD_AUTH_UNCHANGED = TSshPwauth("unchanged")
)
type SWriteFile struct {
@@ -74,7 +79,7 @@ type SCloudConfig struct {
Packages []string
PhoneHome *SPhoneHome
DisableRoot int
SshPwauth int
SshPwauth TSshPwauth
}
func NewWriteFile(path string, content string, perm string, owner string, isBase64 bool) SWriteFile {
pkg/util/cloudinit/cloudconfig_test.go
+1 -1
View File
@@ -43,7 +43,7 @@ func TestSCloudConfig_UserData(t *testing.T) {
Url: "http://www.yunion.io/$INSTANCE_ID",
},
DisableRoot: 0,
SshPwauth: 1,
SshPwauth: SSH_PASSWORD_AUTH_ON,
}
userData := config.UserData()