Updated Branches: refs/heads/network-refactor b429dd491 -> ae8df820f
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. Conflicts: server/src/com/cloud/server/ConfigurationServerImpl.java Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/ae8df820 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ae8df820 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/ae8df820 Branch: refs/heads/network-refactor Commit: ae8df820fb0931a706e3e2c2dae72781cb98d882 Parents: b429dd4 Author: Prachi Damle <[email protected]> Authored: Wed Jan 16 17:22:02 2013 -0800 Committer: Prachi Damle <[email protected]> Committed: Wed Jan 16 17:22:02 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/ae8df820/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 c0c29ed..5512186 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, username, account_id, firstname, lastname, created, state) " + - "VALUES (" + id + ",'" + 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 {
