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

Merge pull request #1885 from Accelerite/vpctier 

CLOUDSTACK-9724: Fixed missing additional public ip on tier network wIn VPC tier network acquire an ip and configure the PF service on it. VR now will have the two ip addresses on the interface.
Now restart the VPC tier network with cleanup option. After router comes up the public interface has only one ip (source nat ip)
Fixed the above issue.

* pr/1885:
  CLOUDSTACK-9724: Fixed missing additional public ip on tier network with cleanup

Signed-off-by: Rajani Karuturi <rajani.karuturi@accelerite.com>
This commit is contained in:
Rajani Karuturi 2017-02-23 05:38:51 +05:30
parent 50147a4208 ee726af53b
commit 9efd9059ef
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/src/com/cloud/network/IpAddressManagerImpl.java
View File

@ -460,6 +460,13 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
}
} else {
if (activeCount != null && activeCount > 0) {
if (network.getVpcId() != null) {
// If there are more than one ip in the vpc tier network and services configured on it.
// restart network with cleanup case, on network reprogramming this needs to be return true
// because on the VR ips has removed. In VPC case restart tier network with cleanup will not
// reboot the VR. So ipassoc is needed.
return true;
}
continue;
} else if (addCount != null && addCount.longValue() == totalCount.longValue()) {
s_logger.trace("All rules are in Add state, have to assiciate IP with the backend");