Skip to content

Commit f5a1f41

Browse files
server: fix global setting system.vm.public.ip.reservation.mode.strictness is not really dynamic (#7909)
If the original value is `false`, and search build is configured without the condition. Now change the value to `true`, it will not get effective due to missing condition.
1 parent e964395 commit f5a1f41

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

server/src/main/java/com/cloud/network/IpAddressManagerImpl.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -496,9 +496,8 @@ public boolean configure(String name, Map<String, Object> params) {
496496
AssignIpAddressSearch.and("dc", AssignIpAddressSearch.entity().getDataCenterId(), Op.EQ);
497497
AssignIpAddressSearch.and("allocated", AssignIpAddressSearch.entity().getAllocatedTime(), Op.NULL);
498498
AssignIpAddressSearch.and("vlanId", AssignIpAddressSearch.entity().getVlanId(), Op.IN);
499-
if (SystemVmPublicIpReservationModeStrictness.value()) {
500-
AssignIpAddressSearch.and("forSystemVms", AssignIpAddressSearch.entity().isForSystemVms(), Op.EQ);
501-
}
499+
AssignIpAddressSearch.and("forSystemVms", AssignIpAddressSearch.entity().isForSystemVms(), Op.EQ);
500+
502501
SearchBuilder<VlanVO> vlanSearch = _vlanDao.createSearchBuilder();
503502
vlanSearch.and("type", vlanSearch.entity().getVlanType(), Op.EQ);
504503
vlanSearch.and("networkId", vlanSearch.entity().getNetworkId(), Op.EQ);

0 commit comments

Comments
 (0)