diff --git a/pkg/compute/guestdrivers/aliyun.go b/pkg/compute/guestdrivers/aliyun.go index 10e23cab6c..5cbc938b69 100644 --- a/pkg/compute/guestdrivers/aliyun.go +++ b/pkg/compute/guestdrivers/aliyun.go @@ -153,7 +153,7 @@ func (self *SAliyunGuestDriver) GetGuestInitialStateAfterRebuild() string { func (self *SAliyunGuestDriver) GetLinuxDefaultAccount(desc cloudprovider.SManagedVMCreateConfig) string { userName := "root" - if desc.ImageType == "system" && desc.OsType == "Windows" { + if desc.OsType == "Windows" { userName = "Administrator" } return userName diff --git a/pkg/compute/guestdrivers/base.go b/pkg/compute/guestdrivers/base.go index 583c0ca4c7..c1346a9659 100644 --- a/pkg/compute/guestdrivers/base.go +++ b/pkg/compute/guestdrivers/base.go @@ -273,7 +273,7 @@ func (self *SBaseGuestDriver) GetUserDataType() string { func (self *SBaseGuestDriver) GetLinuxDefaultAccount(desc cloudprovider.SManagedVMCreateConfig) string { userName := "root" - if desc.ImageType == "system" && desc.OsType == "Windows" { + if desc.OsType == "Windows" { userName = "Administrator" } return userName diff --git a/pkg/compute/guestdrivers/huawei.go b/pkg/compute/guestdrivers/huawei.go index 980b426866..81425a030d 100644 --- a/pkg/compute/guestdrivers/huawei.go +++ b/pkg/compute/guestdrivers/huawei.go @@ -110,9 +110,9 @@ func (self *SHuaweiGuestDriver) GetLinuxDefaultAccount(desc cloudprovider.SManag if desc.OsDistribution == "Ubuntu" { userName = "ubuntu" } - if desc.OsType == "Windows" { - userName = "Administrator" - } + } + if desc.OsType == "Windows" { + userName = "Administrator" } return userName } diff --git a/pkg/compute/guestdrivers/qcloud.go b/pkg/compute/guestdrivers/qcloud.go index 8a99e701f2..19d7bfb1af 100644 --- a/pkg/compute/guestdrivers/qcloud.go +++ b/pkg/compute/guestdrivers/qcloud.go @@ -171,9 +171,9 @@ func (self *SQcloudGuestDriver) GetLinuxDefaultAccount(desc cloudprovider.SManag if desc.OsDistribution == "Ubuntu" { userName = "ubuntu" } - if desc.OsType == "Windows" { - userName = "Administrator" - } + } + if desc.OsType == "Windows" { + userName = "Administrator" } return userName } diff --git a/pkg/compute/guestdrivers/zstack.go b/pkg/compute/guestdrivers/zstack.go index 9c4399a6c4..89427ac617 100644 --- a/pkg/compute/guestdrivers/zstack.go +++ b/pkg/compute/guestdrivers/zstack.go @@ -143,7 +143,7 @@ func (self *SZStackGuestDriver) GetUserDataType() string { func (self *SZStackGuestDriver) GetLinuxDefaultAccount(desc cloudprovider.SManagedVMCreateConfig) string { userName := "root" - if desc.ImageType == "system" && desc.OsType == "Windows" { + if desc.OsType == "Windows" { userName = "Administrator" } return userName