You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2013/01/15 09:21:19 UTC
[24/26] git commit: Summary: Fix logic error
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/1ceecc92
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/1ceecc92
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/1ceecc92
Branch: refs/heads/cloud-agent-with-openvswitch
Commit: 1ceecc92c88c84b99c99547f5c086657ec26f8d7
Parents: e0ecf7b
Author: Hugo Trippaers <tr...@gmail.com>
Authored: Mon Jan 14 16:16:19 2013 +0100
Committer: Hugo Trippaers <tr...@gmail.com>
Committed: Tue Jan 15 09:18:24 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/1ceecc92/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;
}