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/21 12:18:51 UTC

[1/50] [abbrv] git commit: https://issues.apache.org/jira/browse/CLOUDSTACK-993

https://issues.apache.org/jira/browse/CLOUDSTACK-993

Changes:
- Introduction of maven skipped the java code that inserts the admin user. This causes the NPE in management server while trying to find the user and also, admin user cannot login as expected.
- Fixing the insertion of the admin user as part of startup.


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/4d4fb9c9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/4d4fb9c9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/4d4fb9c9

Branch: refs/heads/cloud-agent-with-openvswitch
Commit: 4d4fb9c95964d1981c7ac497fe317f997d367193
Parents: cadca5f
Author: Prachi Damle <pr...@cloud.com>
Authored: Wed Jan 16 17:16:48 2013 -0800
Committer: Chiradeep Vittal <ch...@apache.org>
Committed: Wed Jan 16 19:18:59 2013 -0800

----------------------------------------------------------------------
 .../com/cloud/server/ConfigurationServerImpl.java  |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4d4fb9c9/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 5d24628..74fba89 100755
--- a/server/src/com/cloud/server/ConfigurationServerImpl.java
+++ b/server/src/com/cloud/server/ConfigurationServerImpl.java
@@ -341,8 +341,8 @@ public class ConfigurationServerImpl implements ConfigurationServer {
         }
 
         // now insert the user
-        insertSql = "INSERT INTO `cloud`.`user` (id, uuid, username, account_id, firstname, lastname, created, state) " +
-                "VALUES (" + id + ", UUID(), '" + username + "', 2, '" + firstname + "','" + lastname + "',now(), 'disabled')";
+        insertSql = "INSERT INTO `cloud`.`user` (id, username, password, account_id, firstname, lastname, created, state) " +
+                "VALUES (" + id + ",'" + username + "', RAND(), 2, '" + firstname + "','" + lastname + "',now(), 'disabled')";
 
         txn = Transaction.currentTxn();
         try {