Summary: Fix logic error Should if "if the username is not cloud AND developer is not true, then report an error"
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/4764f988 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/4764f988 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/4764f988 Branch: refs/heads/cloud-agent-with-openvswitch Commit: 4764f98866125972afc3a53d3f5f8ff7f7485b3a Parents: c6916ff Author: Hugo Trippaers <[email protected]> Authored: Mon Jan 14 16:16:19 2013 +0100 Committer: Hugo Trippaers <[email protected]> Committed: Mon Jan 14 16:16:19 2013 +0100 ---------------------------------------------------------------------- .../com/cloud/server/ConfigurationServerImpl.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4764f988/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 b25c63f..7e5f424 100755 --- a/server/src/com/cloud/server/ConfigurationServerImpl.java +++ b/server/src/com/cloud/server/ConfigurationServerImpl.java @@ -549,7 +549,7 @@ public class ConfigurationServerImpl implements ConfigurationServer { String username = System.getProperty("user.name"); Boolean devel = Boolean.valueOf(_configDao.getValue("developer")); - if (!username.equalsIgnoreCase("cloud") || !devel) { + if (!username.equalsIgnoreCase("cloud") && !devel) { s_logger.warn("Systemvm keypairs could not be set. Management server should be run as cloud user, or in development mode."); return; }
