From c2f0a2f6da142d5ebde279b1adea20ca712e2195 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Tue, 18 Jun 2013 12:56:19 +0200 Subject: [PATCH] CLOUDSTACK-1866: create iptables rules for network usage in finalizeSshAndVersionAndNetworkUsageOnStart only for non-Vpc network --- .../network/router/VirtualNetworkApplianceManagerImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index e895a46bc8e..f0b73096d30 100755 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -2280,7 +2280,8 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V // Network usage command to create iptables rules boolean forVpc = profile.getVirtualMachine().getVpcId() != null; - cmds.addCommand("networkUsage", new NetworkUsageCommand(controlNic.getIp4Address(), router.getHostName(), "create", forVpc)); + if (!forVpc) + cmds.addCommand("networkUsage", new NetworkUsageCommand(controlNic.getIp4Address(), router.getHostName(), "create", forVpc)); } protected void finalizeUserDataAndDhcpOnStart(Commands cmds, DomainRouterVO router, Provider provider, Long guestNetworkId) {