You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2017/04/17 20:18:09 UTC

[15/34] ambari git commit: AMBARI-20666 - beginning or ending commas in dfs.cluster.administrators cause trouble for starting services

AMBARI-20666 - beginning or ending commas in dfs.cluster.administrators cause trouble for starting services


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/269ac0a1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/269ac0a1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/269ac0a1

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 269ac0a1f28d26180a1f684869a884d18f96d086
Parents: b9c82ad
Author: Tim Thorpe <tt...@apache.org>
Authored: Thu Apr 13 10:51:36 2017 -0700
Committer: Tim Thorpe <tt...@apache.org>
Committed: Thu Apr 13 10:51:36 2017 -0700

----------------------------------------------------------------------
 .../HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py  | 4 ++--
 .../HDP/3.0/hooks/before-ANY/scripts/shared_initialization.py    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/269ac0a1/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py
index 4d0de7f..1f17cd1 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py
@@ -109,8 +109,8 @@ def create_users_and_groups(user_and_groups):
   if len(parts) == 1:
     parts.append("")
 
-  users_list = parts[0].split(",") if parts[0] else []
-  groups_list = parts[1].split(",") if parts[1] else []
+  users_list = parts[0].strip(",").split(",") if parts[0] else []
+  groups_list = parts[1].strip(",").split(",") if parts[1] else []
 
   # skip creating groups and users if * is provided as value.
   users_list = filter(lambda x: x != '*' , users_list)

http://git-wip-us.apache.org/repos/asf/ambari/blob/269ac0a1/ambari-server/src/main/resources/stacks/HDP/3.0/hooks/before-ANY/scripts/shared_initialization.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/3.0/hooks/before-ANY/scripts/shared_initialization.py b/ambari-server/src/main/resources/stacks/HDP/3.0/hooks/before-ANY/scripts/shared_initialization.py
index 320872e..5d79084 100644
--- a/ambari-server/src/main/resources/stacks/HDP/3.0/hooks/before-ANY/scripts/shared_initialization.py
+++ b/ambari-server/src/main/resources/stacks/HDP/3.0/hooks/before-ANY/scripts/shared_initialization.py
@@ -109,8 +109,8 @@ def create_users_and_groups(user_and_groups):
   if len(parts) == 1:
     parts.append("")
 
-  users_list = parts[0].split(",") if parts[0] else []
-  groups_list = parts[1].split(",") if parts[1] else []
+  users_list = parts[0].strip(",").split(",") if parts[0] else []
+  groups_list = parts[1].strip(",").split(",") if parts[1] else []
 
   if users_list:
     User(users_list,