You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2015/07/22 20:22:17 UTC

[1/2] ambari git commit: AMBARI-12490. Ranger plugin enable script in ambari tries to create amb_ranger_admin user even if it already exists (Gautam Borad via alejandro)

Repository: ambari
Updated Branches:
  refs/heads/branch-2.0.maint 1e084d7b0 -> 4b99744b2


AMBARI-12490. Ranger plugin enable script in ambari tries to create amb_ranger_admin user even if it already exists (Gautam Borad via alejandro)


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

Branch: refs/heads/branch-2.0.maint
Commit: 576749a8a95e4ed30b393d611e0b2af3582379f4
Parents: 1e084d7
Author: Alejandro Fernandez <af...@hortonworks.com>
Authored: Wed Jul 22 11:20:12 2015 -0700
Committer: Alejandro Fernandez <af...@hortonworks.com>
Committed: Wed Jul 22 11:20:12 2015 -0700

----------------------------------------------------------------------
 .../resource_management/libraries/functions/ranger_functions.py  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/576749a8/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions.py b/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions.py
index 78d9a97..0d38dc8 100644
--- a/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions.py
+++ b/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions.py
@@ -233,7 +233,7 @@ class Rangeradmin:
 
   def create_ambari_admin_user(self,ambari_admin_username, ambari_admin_password,usernamepassword):
     try:
-      url =  self.urlUsers + '?startIndex=0'
+      url =  self.urlUsers + '?name=' + str(ambari_admin_username)
       request = urllib2.Request(url)
       base64string = base64.encodestring(usernamepassword).replace('\n', '')
       request.add_header("Content-Type", "application/json")
@@ -242,7 +242,7 @@ class Rangeradmin:
       result = urllib2.urlopen(request)
       response_code =  result.getcode()
       response = json.loads(result.read())
-      if response_code == 200 and len(response['vXUsers']) > 0:
+      if response_code == 200 and len(response['vXUsers']) >= 0:
         ambari_admin_username = ambari_admin_username
         flag_ambari_admin_present = False
         for vxuser in response['vXUsers']:


[2/2] ambari git commit: AMBARI-12491. Ambari 2.0 Ranger usersync bind password is not hidden (Gautam Borad via alejandro)

Posted by al...@apache.org.
AMBARI-12491. Ambari 2.0 Ranger usersync bind password is not hidden (Gautam Borad via alejandro)


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

Branch: refs/heads/branch-2.0.maint
Commit: 4b99744b2fb5fbb01e72069d4db3fdbc7ad909bc
Parents: 576749a
Author: Alejandro Fernandez <af...@hortonworks.com>
Authored: Wed Jul 22 11:20:34 2015 -0700
Committer: Alejandro Fernandez <af...@hortonworks.com>
Committed: Wed Jul 22 11:20:34 2015 -0700

----------------------------------------------------------------------
 .../RANGER/0.4.0/configuration/usersync-properties.xml              | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/4b99744b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/usersync-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/usersync-properties.xml b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/usersync-properties.xml
index 794c3d6..0bbcb41 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/usersync-properties.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/usersync-properties.xml
@@ -48,6 +48,7 @@
   <property>
     <name>SYNC_LDAP_BIND_PASSWORD</name>
     <value>admin321</value>
+    <property-type>PASSWORD</property-type>
     <description></description>
   </property>
   <property>