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

CLOUDSTACK-7121: Make IPv6 preference over IPv4 configurable 

Also set the logging to info instead of debug
This commit is contained in:
Wido den Hollander 2014-07-30 16:26:09 +02:00
parent e1be035870
commit 74862fada5
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
agent/src/com/cloud/agent/AgentShell.java
View File

@ -424,11 +424,25 @@ public class AgentShell implements IAgentShell, Daemon {
ipv6disabled = Boolean.parseBoolean(ipv6);
}
boolean ipv6prefer = false;
String ipv6p = getProperty(null, "ipv6prefer");
if (ipv6p != null) {
ipv6prefer = Boolean.parseBoolean(ipv6p);
}
if (ipv6disabled) {
s_logger.debug("Preferring IPv4 address family for agent connection");
s_logger.info("Preferring IPv4 address family for agent connection");
System.setProperty("java.net.preferIPv4Stack", "true");
if (ipv6prefer) {
s_logger.info("ipv6prefer is set to true, but ipv6disabled is false. Not preferring IPv6 for agent connection");
}
} else {
s_logger.debug("Preferring IPv6 address family for agent connection");
if (ipv6prefer) {
s_logger.info("Preferring IPv6 address family for agent connection");
System.setProperty("java.net.preferIPv6Addresses", "true");
} else {
s_logger.info("Using default Java settings for IPv6 preference for agent connection");
}
}
String instance = getProperty(null, "instance");