From 2f85c806553ffdf390b04a47516e9b580a05f846 Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@citrix.com>
Date: Mon, 15 Jul 2013 18:25:54 -0700
Subject: [PATCH] CLOUDSTACK-3539: Fix wrong management ip when server start up

The value "localhost" for mgmt server should be over-written anyway.
---
 server/src/com/cloud/server/ConfigurationServerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java
index 9e79b762e1c..9a9b1456d1d 100755
--- a/server/src/com/cloud/server/ConfigurationServerImpl.java
+++ b/server/src/com/cloud/server/ConfigurationServerImpl.java
@@ -235,7 +235,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio
             	Boolean devel = Boolean.valueOf(_configDao.getValue("developer"));
             	if (devel) {
             		String value = _configDao.getValue(Config.ManagementHostIPAdr.key());
-            		if (value != null) {
+            		if (value != null && !value.equals("localhost")) {
             			needUpdateHostIp = false;
             		}
             	}