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

Azure禁止使用root账户登录，创建机器后返回默认用户名，避免数据不一致

Browse Source
This commit is contained in:
屈轩
2018-10-17 18:49:07 +08:00
parent 681c46e905
commit ec432d1ee9
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/guestdrivers/aliyun.go
+5 -5
View File
@@ -75,7 +75,7 @@ type SDiskInfo struct {
Metadata map[string]string
}
func fetchIVMinfo(desc SManagedVMCreateConfig, iVM cloudprovider.ICloudVM, guestId string, passwd string) *jsonutils.JSONDict {
func fetchIVMinfo(desc SManagedVMCreateConfig, iVM cloudprovider.ICloudVM, guestId string, account, passwd string) *jsonutils.JSONDict {
data := jsonutils.NewDict()
data.Add(jsonutils.NewString(iVM.GetOSType()), "os")
@@ -85,7 +85,7 @@ func fetchIVMinfo(desc SManagedVMCreateConfig, iVM cloudprovider.ICloudVM, guest
if err != nil {
log.Errorf("encrypt password failed %s", err)
}
data.Add(jsonutils.NewString("root"), "account")
data.Add(jsonutils.NewString(account), "account")
data.Add(jsonutils.NewString(encpasswd), "key")
}
@@ -207,7 +207,7 @@ func (self *SAliyunGuestDriver) RequestDeployGuestOnHost(ctx context.Context, gu
}
}*/
data := fetchIVMinfo(desc, iVM, guest.Id, passwd)
data := fetchIVMinfo(desc, iVM, guest.Id, "root", passwd)
/* data.Add(jsonutils.NewString(iVM.GetOSType()), "os")
@@ -287,7 +287,7 @@ func (self *SAliyunGuestDriver) RequestDeployGuestOnHost(ctx context.Context, gu
return nil, err
}
data := fetchIVMinfo(desc, iVM, guest.Id, passwd)
data := fetchIVMinfo(desc, iVM, guest.Id, "root", passwd)
/*
data := jsonutils.NewDict()
@@ -354,7 +354,7 @@ func (self *SAliyunGuestDriver) RequestDeployGuestOnHost(ctx context.Context, gu
}
}
data := fetchIVMinfo(desc, iVM, guest.Id, passwd)
data := fetchIVMinfo(desc, iVM, guest.Id, "root", passwd)
return data, nil
})
pkg/compute/guestdrivers/azure.go
+3 -3
View File
@@ -110,7 +110,7 @@ func (self *SAzureGuestDriver) RequestDeployGuestOnHost(ctx context.Context, gue
return nil, err
}
data := fetchIVMinfo(desc, iVM, guest.Id, passwd)
data := fetchIVMinfo(desc, iVM, guest.Id, DEFAULT_USER, passwd)
return data, nil
}
})
@@ -133,7 +133,7 @@ func (self *SAzureGuestDriver) RequestDeployGuestOnHost(ctx context.Context, gue
if err != nil {
return nil, err
}
data := fetchIVMinfo(desc, iVM, guest.Id, passwd)
data := fetchIVMinfo(desc, iVM, guest.Id, DEFAULT_USER, passwd)
return data, nil
})
} else if action == "rebuild" {
@@ -150,7 +150,7 @@ func (self *SAzureGuestDriver) RequestDeployGuestOnHost(ctx context.Context, gue
}
log.Debugf("VMrebuildRoot %s, and status is ready", iVM.GetGlobalId())
data := fetchIVMinfo(desc, iVM, guest.Id, passwd)
data := fetchIVMinfo(desc, iVM, guest.Id, DEFAULT_USER, passwd)
return data, nil
})