ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlun...@apache.org
Subject ambari git commit: AMBARI-12200: RU : Ranger Usersync LDAP configurations not migrated properly (Gautam Borad via jluniya)
Date Wed, 01 Jul 2015 01:45:38 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 5dd1dbd45 -> 1a48a736a


AMBARI-12200: RU : Ranger Usersync LDAP configurations not migrated properly (Gautam Borad
via jluniya)


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

Branch: refs/heads/trunk
Commit: 1a48a736ab19675d2652d184b7fe20397b53d785
Parents: 5dd1dbd
Author: Jayush Luniya <jluniya@hortonworks.com>
Authored: Tue Jun 30 18:45:35 2015 -0700
Committer: Jayush Luniya <jluniya@hortonworks.com>
Committed: Tue Jun 30 18:45:35 2015 -0700

----------------------------------------------------------------------
 .../stacks/HDP/2.2/upgrades/upgrade-2.3.xml     | 26 ++++--
 .../RANGER/configuration/ranger-ugsync-site.xml | 14 +--
 ambari-web/app/data/HDP2.3/site_properties.js   | 90 ++++++++++++++++++++
 3 files changed, 115 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/1a48a736/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
index 90706ba..3fa90be 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
@@ -392,19 +392,29 @@
             <transfer operation="copy" from-type="usersync-properties" from-key="MIN_UNIX_USER_ID_TO_SYNC"
to-key="ranger.usersync.unix.minUserId" default-value="" />
             <transfer operation="copy" from-type="usersync-properties" from-key="SYNC_INTERVAL"
to-key="ranger.usersync.sleeptimeinmillisbetweensynccycle" default-value="60000" />
             <transfer operation="copy" from-type="usersync-properties" from-key="SYNC_LDAP_BIND_DN"
to-key="ranger.usersync.ldap.binddn" default-value="" />
-            <transfer operation="copy" from-type="usersync-properties" from-key="SYNC_LDAP_BIND_PASSWORD"
to-key="" default-value="ranger.usersync.ldap.ldapbindpassword" mask="true" />
+            <transfer operation="copy" from-type="usersync-properties" from-key="SYNC_LDAP_BIND_PASSWORD"
to-key="ranger.usersync.ldap.ldapbindpassword" default-value="" mask="true" />
             <transfer operation="copy" from-type="usersync-properties" from-key="SYNC_LDAP_GROUPNAME_CASE_CONVERSION"
to-key="ranger.usersync.ldap.groupname.caseconversion" default-value="" />
             <transfer operation="copy" from-type="usersync-properties" from-key="SYNC_LDAP_URL"
to-key="ranger.usersync.ldap.url" default-value="" />
             <transfer operation="copy" from-type="usersync-properties" from-key="SYNC_LDAP_USERNAME_CASE_CONVERSION"
to-key="ranger.usersync.ldap.username.caseconversion" default-value="" />
-            <transfer operation="copy" from-type="usersync-properties" from-key="SYNC_LDAP_USER_GROUP_NAME_ATTRIBUTE"
to-key="ranger.usersync.group.memberattributename" default-value="" />
-            <transfer operation="copy" from-type="usersync-properties" from-key="SYNC_LDAP_USER_NAME_ATTRIBUTE"
to-key="ranger.usersync.group.nameattribute" default-value="" />
-            <transfer operation="copy" from-type="usersync-properties" from-key="SYNC_LDAP_USER_OBJECT_CLASS"
to-key="ranger.usersync.group.objectclass" default-value="" />
-            <transfer operation="copy" from-type="usersync-properties" from-key="SYNC_LDAP_USER_SEARCH_BASE"
to-key="ranger.usersync.group.searchbase" default-value="" />
-            <transfer operation="copy" from-type="usersync-properties" from-key="SYNC_LDAP_USER_SEARCH_FILTER"
to-key="ranger.usersync.group.searchfilter" default-value="" />
-            <transfer operation="copy" from-type="usersync-properties" from-key="SYNC_LDAP_USER_SEARCH_SCOPE"
to-key="ranger.usersync.group.searchscope" default-value="" />
+            <transfer operation="copy" from-type="usersync-properties" from-key="SYNC_LDAP_USER_GROUP_NAME_ATTRIBUTE"
to-key="ranger.usersync.ldap.user.groupnameattribute" default-value="" />
+            <transfer operation="copy" from-type="usersync-properties" from-key="SYNC_LDAP_USER_NAME_ATTRIBUTE"
to-key="ranger.usersync.ldap.user.nameattribute" default-value="" />
+            <transfer operation="copy" from-type="usersync-properties" from-key="SYNC_LDAP_USER_OBJECT_CLASS"
to-key="ranger.usersync.ldap.user.objectclass" default-value="" />
+            <transfer operation="copy" from-type="usersync-properties" from-key="SYNC_LDAP_USER_SEARCH_BASE"
to-key="ranger.usersync.ldap.user.searchbase" default-value="" />
+            <transfer operation="copy" from-type="usersync-properties" from-key="SYNC_LDAP_USER_SEARCH_FILTER"
to-key="ranger.usersync.ldap.user.searchfilter" default-value="" />
+            <transfer operation="copy" from-type="usersync-properties" from-key="SYNC_LDAP_USER_SEARCH_SCOPE"
to-key="ranger.usersync.ldap.user.searchscope" default-value="" />
             <transfer operation="copy" from-type="usersync-properties" from-key="logdir"
to-key="ranger.usersync.logdir" default-value="" />
-            <transfer operation="copy" from-type="usersync-properties" from-key="SYNC_SOURCE"
to-key="ranger.usersync.source.impl.class" default-value="org.apache.ranger.unixusersync.process.UnixUserGroupBuilder"
/>
+            <transfer operation="copy" from-type="usersync-properties" from-key="SYNC_SOURCE"
to-key="ranger.usersync.sync.source" default-value="unix" />
             <transfer operation="copy" from-type="usersync-properties" from-key="POLICY_MGR_URL"
to-key="ranger.usersync.policymanager.baseURL" default-value="{{ranger_external_url}}" />
+            <set key="ranger.usersync.source.impl.class" value="" />
+            <set key="ranger.usersync.ldap.searchBase" value="" />
+            <set key="ranger.usersync.group.memberattributename" value="" />
+            <set key="ranger.usersync.group.nameattribute" value="" />
+            <set key="ranger.usersync.group.objectclass" value="" />
+            <set key="ranger.usersync.group.searchbase" value="" />
+            <set key="ranger.usersync.group.searchenabled" value="" />
+            <set key="ranger.usersync.group.searchfilter" value="" />
+            <set key="ranger.usersync.group.searchscope" value="" />
+            <set key="ranger.usersync.group.usermapsyncenabled" value="" />
           </task>
             
           <task xsi:type="configure">

http://git-wip-us.apache.org/repos/asf/ambari/blob/1a48a736/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-ugsync-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-ugsync-site.xml
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-ugsync-site.xml
index d4cdfd7..eb27958 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-ugsync-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-ugsync-site.xml
@@ -227,37 +227,37 @@
 
   <property>
     <name>ranger.usersync.group.searchbase</name>
-    <value>ou=groups,dc=hadoop,dc=apache,dc=org</value>
+    <value> </value>
     <description></description>
   </property>
 
   <property>
     <name>ranger.usersync.group.searchscope</name>
-    <value>sub</value>
+    <value> </value>
     <description></description>
   </property>
 
   <property>
     <name>ranger.usersync.group.objectclass</name>
-    <value>groupofnames</value>
+    <value> </value>
     <description></description>
   </property>
 
   <property>
     <name>ranger.usersync.group.searchfilter</name>
-    <value>empty</value>
+    <value> </value>
     <description></description>
   </property>
 
   <property>
     <name>ranger.usersync.group.nameattribute</name>
-    <value>cn</value>
+    <value> </value>
     <description></description>
   </property>
 
   <property>
     <name>ranger.usersync.group.memberattributename</name>
-    <value>member</value>
+    <value> </value>
     <description></description>
   </property>
 
@@ -279,4 +279,4 @@
     <description></description>
   </property>                         
 
-</configuration>  
\ No newline at end of file
+</configuration>  

http://git-wip-us.apache.org/repos/asf/ambari/blob/1a48a736/ambari-web/app/data/HDP2.3/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2.3/site_properties.js b/ambari-web/app/data/HDP2.3/site_properties.js
index 76d4b8f..5e2b2c1 100644
--- a/ambari-web/app/data/HDP2.3/site_properties.js
+++ b/ambari-web/app/data/HDP2.3/site_properties.js
@@ -855,6 +855,96 @@ hdp23properties.push({
   },
   {
     "id": "site property",
+    "name": "ranger.usersync.group.memberattributename",
+    "displayName": "ranger.usersync.group.memberattributename",
+    "category": "Advanced ranger-ugsync-site",
+    "isRequired": false,
+    "serviceName": "RANGER",
+    "filename": "ranger-ugsync-site.xml"
+  },
+  {
+    "id": "site property",
+    "name": "ranger.usersync.group.nameattribute",
+    "displayName": "ranger.usersync.group.nameattribute",
+    "category": "Advanced ranger-ugsync-site",
+    "isRequired": false,
+    "serviceName": "RANGER",
+    "filename": "ranger-ugsync-site.xml"
+  },
+  {
+    "id": "site property",
+    "name": "ranger.usersync.group.objectclass",
+    "displayName": "ranger.usersync.group.objectclass",
+    "category": "Advanced ranger-ugsync-site",
+    "isRequired": false,
+    "serviceName": "RANGER",
+    "filename": "ranger-ugsync-site.xml"
+  },
+  {
+    "id": "site property",
+    "name": "ranger.usersync.group.searchbase",
+    "displayName": "ranger.usersync.group.searchbase",
+    "category": "Advanced ranger-ugsync-site",
+    "isRequired": false,
+    "serviceName": "RANGER",
+    "filename": "ranger-ugsync-site.xml"
+  },
+  {
+    "id": "site property",
+    "name": "ranger.usersync.group.searchenabled",
+    "displayName": "ranger.usersync.group.searchenabled",
+    "category": "Advanced ranger-ugsync-site",
+    "isRequired": false,
+    "serviceName": "RANGER",
+    "filename": "ranger-ugsync-site.xml"
+  },
+  {
+    "id": "site property",
+    "name": "ranger.usersync.group.searchfilter",
+    "displayName": "ranger.usersync.group.searchfilter",
+    "category": "Advanced ranger-ugsync-site",
+    "isRequired": false,
+    "serviceName": "RANGER",
+    "filename": "ranger-ugsync-site.xml"
+  },
+  {
+    "id": "site property",
+    "name": "ranger.usersync.group.searchscope",
+    "displayName": "ranger.usersync.group.searchscope",
+    "category": "Advanced ranger-ugsync-site",
+    "isRequired": false,
+    "serviceName": "RANGER",
+    "filename": "ranger-ugsync-site.xml"
+  },
+  {
+    "id": "site property",
+    "name": "ranger.usersync.group.usermapsyncenabled",
+    "displayName": "ranger.usersync.group.usermapsyncenabled",
+    "category": "Advanced ranger-ugsync-site",
+    "isRequired": false,
+    "serviceName": "RANGER",
+    "filename": "ranger-ugsync-site.xml"
+  },
+  {
+    "id": "site property",
+    "name": "ranger.usersync.ldap.searchBase",
+    "displayName": "ranger.usersync.ldap.searchBase",
+    "category": "Advanced ranger-ugsync-site",
+    "isRequired": false,
+    "serviceName": "RANGER",
+    "filename": "ranger-ugsync-site.xml"
+  },
+  {
+    "id": "site property",
+    "name": "ranger.usersync.source.impl.class",
+    "displayName": "ranger.usersync.source.impl.class",
+    "category": "Advanced ranger-ugsync-site",
+    "isRequired": false,
+    "serviceName": "RANGER",
+    "filename": "ranger-ugsync-site.xml"
+  },
+  {
+    "id": "site property",
     "name": "common.name.for.certificate",
     "displayName": "common.name.for.certificate",
     "category": "Advanced ranger-yarn-plugin-properties",


Mime
View raw message