Updated Branches: refs/heads/advancedsg-leaseweb [created] c5383c8d2
only basic zone is pod based network Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5a4ecb9e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5a4ecb9e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5a4ecb9e Branch: refs/heads/advancedsg-leaseweb Commit: 5a4ecb9ee219009d41c1dd54944cea53d0c3a9c6 Parents: a5214be Author: Anthony Xu <[email protected]> Authored: Wed May 29 17:47:51 2013 -0700 Committer: Wei Zhou <[email protected]> Committed: Tue Jun 11 09:37:37 2013 +0200 ---------------------------------------------------------------------- .../cloud/network/router/VirtualNetworkApplianceManagerImpl.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5a4ecb9e/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 e895a46..b43b455 100755 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -1427,9 +1427,7 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V assert guestNetwork.getTrafficType() == TrafficType.Guest; // 1) Get deployment plan and find out the list of routers - boolean isPodBased = (dest.getDataCenter().getNetworkType() == NetworkType.Basic || - _networkModel.areServicesSupportedInNetwork(guestNetwork.getId(), Service.SecurityGroup)) - && guestNetwork.getTrafficType() == TrafficType.Guest; + boolean isPodBased = (dest.getDataCenter().getNetworkType() == NetworkType.Basic); // dest has pod=null, for Basic Zone findOrDeployVRs for all Pods List<DeployDestination> destinations = new ArrayList<DeployDestination>();
