From 2c07ce590d9763033aff2ee895915eefe8a16030 Mon Sep 17 00:00:00 2001 From: Remi Bergsma Date: Thu, 31 Dec 2015 14:20:52 +0100 Subject: [PATCH] CLOUDSTACK-6485 prevent ip asignment of private gw iface Prevent ipaddress asignment of gateway to gateway-interface on vpc router by setting vpcid to null in network Was fixed in 4.4 by 1f209ff226a24979cf3a43ce0c02e05c84dd4dc2 Reimplemented for 4.7 --- server/src/com/cloud/network/vpc/VpcManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java index fe9a86f8209..e9a22024987 100644 --- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java +++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java @@ -1668,7 +1668,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis // A more permanent solution would be to define a type of 'gatewaynetwork' // so that handling code is not mixed between the two final NetworkVO gatewaynet = _ntwkDao.findById(privateNtwk.getId()); - gatewaynet.setVpcId(vpcId); + gatewaynet.setVpcId(null); _ntwkDao.persist(gatewaynet); }