etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-1866: create iptables rules for network usage in finalizeSshAndVersionAndNetworkUsageOnStart only for non-Vpc network

This commit is contained in:
Wei Zhou 2013-06-18 12:56:19 +02:00
parent 68f51a3db9
commit c2f0a2f6da
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
View File

@ -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) {