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

fix meta data issue on direct tagged network, where router's public ip address is null

This commit is contained in:
Edison Su 2011-12-13 17:23:28 -08:00
parent 582d565a4f
commit a7b9f00a71
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
View File

@ -770,7 +770,11 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
cmd.addVmData("metadata", "public-hostname", StringUtils.unicodeEscape(vmName));
}else
{
cmd.addVmData("metadata", "public-ipv4", router.getPublicIpAddress());
if (router.getPublicIpAddress() == null) {
cmd.addVmData("metadata", "public-ipv4", guestIpAddress);
} else {
cmd.addVmData("metadata", "public-ipv4", router.getPublicIpAddress());
}
cmd.addVmData("metadata", "public-hostname", router.getPublicIpAddress());
}
cmd.addVmData("metadata", "instance-id", vmInstanceName);