cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sw...@apache.org
Subject [1/3] git commit: updated refs/heads/4.7 to 3fab757
Date Thu, 12 May 2016 15:03:25 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.7 919660d09 -> 3fab75772


Add private gateway IP to router initialization config


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

Branch: refs/heads/4.7
Commit: 65cb22216aa1d5d6257f99d4ad84f80c319cdea9
Parents: ef115ab
Author: Miguel Ferreira <miguelferreira@me.com>
Authored: Wed Feb 24 21:15:26 2016 +0100
Committer: Remi Bergsma <github@remi.nl>
Committed: Thu Apr 7 21:13:00 2016 +0200

----------------------------------------------------------------------
 .../router/VpcVirtualNetworkApplianceManagerImpl.java     | 10 ++++++++++
 1 file changed, 10 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65cb2221/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
index 712c747..e5dd4e0 100644
--- a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
@@ -68,6 +68,7 @@ import com.cloud.network.vpc.StaticRoute;
 import com.cloud.network.vpc.StaticRouteProfile;
 import com.cloud.network.vpc.Vpc;
 import com.cloud.network.vpc.VpcGateway;
+import com.cloud.network.vpc.VpcGatewayVO;
 import com.cloud.network.vpc.VpcManager;
 import com.cloud.network.vpc.VpcVO;
 import com.cloud.network.vpc.dao.PrivateIpDao;
@@ -260,6 +261,15 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian
                 if (defaultDns2 != null) {
                     buf.append(" dns2=").append(defaultDns2);
                 }
+
+                VpcGatewayVO privateGatewayForVpc = _vpcGatewayDao.getPrivateGatewayForVpc(domainRouterVO.getVpcId());
+                if (privateGatewayForVpc != null) {
+                    String ip4Address = privateGatewayForVpc.getIp4Address();
+                    buf.append(" privategateway=").append(ip4Address);
+                    s_logger.debug("Set privategateway field in cmd_line.json to " + ip4Address);
+                } else {
+                    buf.append(" privategateway=None");
+                }
             }
         }
 


Mime
View raw message