incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edi...@apache.org
Subject git commit: Summary: Allow ssh keypairs to be created if developer flag set and user ! cloud
Date Thu, 17 Jan 2013 21:21:39 GMT
Updated Branches:
  refs/heads/network-refactor ae8df820f -> 318ff6a77


Summary: Allow ssh keypairs to be created if developer flag set and user ! cloud

Detail: Previously in the code we allowed the configuration to create ssh
keypairs and put them in the configuration table so that systemvms could have
ssh key auth and work properly if the user was 'cloud' or if the developer
configuration item was set to true. It got changed to requiring both the cloud
user and the developer flag (using an || on a negative) somwhere along the way.
This changes it back to && on a negative to allow us to run as non-cloud users
with the dev flag set, and for cloud to deploy properly without the developer
flag.

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358285190 -0700


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

Branch: refs/heads/network-refactor
Commit: 318ff6a77495a7beeca9c03c068baeb513b731d8
Parents: ae8df82
Author: Marcus Sorensen <marcus@betterservers.com>
Authored: Tue Jan 15 14:26:30 2013 -0700
Committer: Edison Su <sudison@gmail.com>
Committed: Thu Jan 17 13:21:20 2013 -0800

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


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/318ff6a7/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 5512186..1e7ec72 100755
--- a/server/src/com/cloud/server/ConfigurationServerImpl.java
+++ b/server/src/com/cloud/server/ConfigurationServerImpl.java
@@ -548,7 +548,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;
         }


Mime
View raw message