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

Merge pull request #8245 from zexi/automated-cherry-pick-of-#8242-upstream-release-3.2

Browse Source 
Automated cherry pick of #8242: baremetal: fix pxe filter network by guest_dhcp
This commit is contained in:
yunion-ci-robot
2020-10-13 10:30:29 +08:00
committed by GitHub
parent 5ba53e43b3 1e2e134ad0
commit f335e270cf
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/baremetal/pxe/dhcp.go
+3
View File
@@ -269,6 +269,9 @@ func (req *dhcpRequest) findNetworkConf(session *mcclient.ClientSession, filterU
params.Add(jsonutils.NewString(
fmt.Sprintf("guest_dhcp.endswith(',%s')", req.RelayAddr)),
"filter.3")
params.Add(jsonutils.NewString(
fmt.Sprintf("guest_dhcp.equals(%s)", req.RelayAddr)),
"filter.4")
params.Add(jsonutils.JSONTrue, "filter_any")
}
params.Add(jsonutils.JSONTrue, "is_on_premise")