Merge pull request #2235 from ioito/automated-cherry-pick-of-#2234-upstream-release-2.11

Automated cherry pick of #2234: fix: no need to inject password by cloud-init for qcloud
This commit is contained in:
yunion-ci-robot
2019-08-12 22:17:09 +08:00
committed by GitHub
-4
View File
@@ -217,10 +217,6 @@ func (self *SQcloudGuestDriver) GetGuestInitialStateAfterRebuild() string {
return api.VM_RUNNING
}
func (self *SQcloudGuestDriver) IsNeedInjectPasswordByCloudInit(desc *cloudprovider.SManagedVMCreateConfig) bool {
return true
}
func (self *SQcloudGuestDriver) GetUserDataType() string {
return cloudprovider.CLOUD_SHELL
}