fixes #2524 (#2574)

spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java

@@ -135,6 +135,7 @@ public class EurekaClientAutoConfiguration {
 		String hostname = eurekaPropertyResolver.getProperty("hostname");
 
 		boolean preferIpAddress = Boolean.parseBoolean(eurekaPropertyResolver.getProperty("preferIpAddress"));
+		String ipAddress = eurekaPropertyResolver.getProperty("ipAddress");
 		boolean isSecurePortEnabled = Boolean.parseBoolean(eurekaPropertyResolver.getProperty("securePortEnabled"));
 		String serverContextPath = propertyResolver.getProperty("server.contextPath", "/");
 		int serverPort = Integer.valueOf(propertyResolver.getProperty("server.port", propertyResolver.getProperty("port", "8080")));
@@ -147,6 +148,9 @@ public class EurekaClientAutoConfiguration {
 		instance.setNonSecurePort(serverPort);
 		instance.setInstanceId(getDefaultInstanceId(propertyResolver));
 		instance.setPreferIpAddress(preferIpAddress);
+		if (StringUtils.hasText(ipAddress)) {
+			instance.setIpAddress(ipAddress);
+		}
 
 		if(isSecurePortEnabled) {
 			instance.setSecurePort(serverPort);

spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfigurationTests.java

@@ -289,6 +289,25 @@ public class EurekaClientAutoConfigurationTests {
 
 		assertEquals("statusPageUrl is wrong", "http://" + instance.getIpAddress() + ":9999/info",
 				instance.getStatusPageUrl());
+		assertEquals("healthCheckUrl is wrong", "http://" + instance.getIpAddress() + ":9999/health",
+				instance.getHealthCheckUrl());
+	}
+
+	@Test
+	public void statusPageAndHealthCheckUrlsShouldSetUserDefinedIpAddress() {
+		addEnvironment(this.context, "server.port=8989",
+				"management.port=9999", "eureka.instance.hostname=foo",
+				"eureka.instance.ipAddress:192.168.13.90",
+				"eureka.instance.preferIpAddress:true");
+
+		setupContext(RefreshAutoConfiguration.class);
+		EurekaInstanceConfigBean instance = this.context
+				.getBean(EurekaInstanceConfigBean.class);
+
+		assertEquals("statusPageUrl is wrong", "http://192.168.13.90:9999/info",
+				instance.getStatusPageUrl());
+		assertEquals("healthCheckUrl is wrong", "http://192.168.13.90:9999/health",
+				instance.getHealthCheckUrl());
 	}
 
 	@Test