opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-24 23:41:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(region,esxiagent): allow host behind a nat

Browse Source 
check host by ip may fail if host is behind a nat. ignore this case.
This commit is contained in:
Qiu Jian
2020-11-25 12:17:13 +08:00
parent 4a8eafbc0a
commit a5327c3cec
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/multicloud/esxi/manager.go
+8 -4
View File
@@ -533,7 +533,11 @@ func (cli *SESXiClient) getPrivateId(idStr string) string {
func (cli *SESXiClient) checkHostManagedByVCenter() error {
host, err := cli.FindHostByIp(cli.host)
if err != nil {
return err
if errors.Cause(err) == errors.ErrNotFound {
// host might be behind a NAT
return nil
}
return errors.Wrap(err, "cli.FindHostByIp")
}
if host.IsManagedByVCenter() {
return fmt.Errorf("ESXi host is managed by vcenter %s, please connect to vcenter instead for full management functions!", host.GetManagementServerIp())
@@ -561,18 +565,18 @@ func (cli *SESXiClient) FindHostByIp(hostIp string) (*SHost, error) {
hostRef, err := searchIndex.FindByIp(cli.context, nil, cli.getPrivateId(hostIp), false)
if err != nil {
log.Errorf("searchIndex.FindByIp fail %s", err)
return nil, err
return nil, errors.Wrap(err, "searchIndex.FindByIp")
}
if hostRef == nil {
return nil, fmt.Errorf("cannot find %s", cli.getPrivateId(hostIp))
return nil, errors.Wrapf(errors.ErrNotFound, "cannot find %s", cli.getPrivateId(hostIp))
}
var host mo.HostSystem
err = cli.reference2Object(hostRef.Reference(), HOST_SYSTEM_PROPS, &host)
if err != nil {
log.Errorf("reference2Object fail %s", err)
return nil, err
return nil, errors.Wrap(err, "cli.reference2Object")
}
h := NewHost(cli, &host, nil)