From d022eaba9c99119ec10727004d6fed27458be044 Mon Sep 17 00:00:00 2001 From: Kelven Yang Date: Wed, 12 Oct 2011 14:56:22 -0700 Subject: [PATCH] Make default value of pre-allocated public NICs in domR consistent with the default value in DB --- .../network/router/VirtualNetworkApplianceManagerImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index 21a2f0a2073..95439655a8a 100755 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -329,7 +329,7 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian private String _dnsBasicZoneUpdates = "all"; private boolean _disable_rp_filter = false; - int _routerExtraPublicNics = 5; + int _routerExtraPublicNics = 2; private long mgmtSrvrId = MacAddress.getMacAddress().toLong(); @@ -596,7 +596,7 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian _routerRamSize = NumbersUtil.parseInt(configs.get("router.ram.size"), DEFAULT_ROUTER_VM_RAMSIZE); _routerCpuMHz = NumbersUtil.parseInt(configs.get("router.cpu.mhz"), DEFAULT_ROUTER_CPU_MHZ); - _routerExtraPublicNics = NumbersUtil.parseInt(_configDao.getValue(Config.RouterExtraPublicNics.key()), 5); + _routerExtraPublicNics = NumbersUtil.parseInt(_configDao.getValue(Config.RouterExtraPublicNics.key()), 2); String value = configs.get("start.retry"); _retry = NumbersUtil.parseInt(value, 2);