opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-01 15:07:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(baremetal): use ipmitool power reset when redfish power on error

Browse Source
This commit is contained in:
Zexi Li
2021-07-09 10:37:49 +08:00
parent 72fc836846
commit 539f68309b
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/baremetal/manager.go
+18 -2
View File
@@ -1627,7 +1627,7 @@ func (b *SBaremetalInstance) DoPXEBoot() error {
return fmt.Errorf("Baremetal %s ipmitool is nil", b.GetId())
}
func (b *SBaremetalInstance) DoRedfishPowerOn() error {
func (b *SBaremetalInstance) doRedfishPowerOn() error {
log.Infof("Do Redfish PowerOn ........., wait")
ctx := context.Background()
b.ClearSSHConfig()
@@ -1636,7 +1636,7 @@ func (b *SBaremetalInstance) DoRedfishPowerOn() error {
err := redfishApi.Reset(ctx, "On")
if err != nil {
if httputils.ErrorCode(err) == 409 {
log.Warningf("redfishApi.Reset On fail %s", err)
return errors.Wrap(err, "redfishApi.Reset On fail, code 409")
} else {
return errors.Wrap(err, "redfishApi.Reset On")
}
@@ -1646,6 +1646,22 @@ func (b *SBaremetalInstance) DoRedfishPowerOn() error {
return fmt.Errorf("Baremetal %s redfishApi is nil", b.GetId())
}
func (b *SBaremetalInstance) DoRedfishPowerOn() error {
err := b.doRedfishPowerOn()
if err == nil {
return nil
}
var errs = []error{err}
log.Warningf("Do redfish power on error: %v, try use fallback IPMI way", err)
ipmiCli := b.GetIPMITool()
if err := ipmitool.DoReboot(ipmiCli); err != nil {
errs = append(errs, errors.Wrap(err, "Fallback to use ipmitool reboot"))
} else {
return nil
}
return errors.NewAggregate(errs)
}
/*
func (b *SBaremetalInstance) DoDiskBoot() error {
log.Infof("Do DISK Boot ........., wait")