cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From weiz...@apache.org
Subject git commit: updated refs/heads/master to 9d7c7c1
Date Tue, 18 Jun 2013 10:56:26 GMT
Updated Branches:
  refs/heads/master 746af2bb6 -> 9d7c7c14c


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


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9d7c7c14
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9d7c7c14
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9d7c7c14

Branch: refs/heads/master
Commit: 9d7c7c14c793e86a182e6a7c2b60b95262aa9859
Parents: 746af2b
Author: Wei Zhou <w.zhou@leaseweb.com>
Authored: Tue Jun 18 12:56:19 2013 +0200
Committer: Wei Zhou <w.zhou@leaseweb.com>
Committed: Tue Jun 18 12:56:19 2013 +0200

----------------------------------------------------------------------
 .../cloud/network/router/VirtualNetworkApplianceManagerImpl.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9d7c7c14/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 8da5176..8edd5bd 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -2351,7 +2351,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) {


Mime
View raw message