Updated Branches: refs/heads/master 9fe1a2b9f -> ab42c1d6d
CLOUDSTACK-3539: Fix wrong management ip when server start up The value "localhost" for mgmt server should be over-written anyway. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ab42c1d6 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ab42c1d6 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ab42c1d6 Branch: refs/heads/master Commit: ab42c1d6da2e023c30be39285c327e88d9f97cb8 Parents: 9fe1a2b Author: Sheng Yang <[email protected]> Authored: Mon Jul 15 18:25:54 2013 -0700 Committer: Sheng Yang <[email protected]> Committed: Mon Jul 15 18:27:15 2013 -0700 ---------------------------------------------------------------------- server/src/com/cloud/server/ConfigurationServerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ab42c1d6/server/src/com/cloud/server/ConfigurationServerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java index 9e79b76..9a9b145 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; } }
