You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sr...@apache.org on 2016/05/20 20:46:55 UTC

ambari git commit: AMBARI-15913. Ranger User sync settings control broken in Ambari UI after upgrade (Mugdha Varadkar via srimanth)

Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 1c53b030a -> 6d1e5078e


AMBARI-15913. Ranger User sync settings control broken in Ambari UI after upgrade (Mugdha Varadkar via srimanth)


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

Branch: refs/heads/branch-2.4
Commit: 6d1e5078ed3bc7d681502c7e9ed81cb2ffcda440
Parents: 1c53b03
Author: Srimanth Gunturi <sg...@hortonworks.com>
Authored: Fri May 20 13:46:32 2016 -0700
Committer: Srimanth Gunturi <sg...@hortonworks.com>
Committed: Fri May 20 13:46:37 2016 -0700

----------------------------------------------------------------------
 .../stacks/HDP/2.2/upgrades/config-upgrade.xml  | 24 ++++++--------------
 1 file changed, 7 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/6d1e5078/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/config-upgrade.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/config-upgrade.xml
index c537c77..f7405c1 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/config-upgrade.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/config-upgrade.xml
@@ -658,19 +658,19 @@
 
           <definition xsi:type="configure" id="hdp_2_3_0_0_update_ranger_admin" summary="Updating Ranger Admin">
             <type>ranger-admin-site</type>
-            <transfer operation="copy" from-type="ranger-site" from-key="HTTPS_CLIENT_AUTH"
+            <transfer operation="copy" from-type="ranger-site" from-key="https.attrib.clientAuth"
                       to-key="ranger.service.https.attrib.clientAuth" default-value=""/>
-            <transfer operation="copy" from-type="ranger-site" from-key="HTTPS_KEYSTORE_FILE"
+            <transfer operation="copy" from-type="ranger-site" from-key="https.attrib.keystoreFile"
                       to-key="ranger.https.attrib.keystore.file" default-value=""/>
-            <transfer operation="copy" from-type="ranger-site" from-key="HTTPS_KEYSTORE_PASS"
+            <transfer operation="copy" from-type="ranger-site" from-key="https.attrib.keystorePass"
                       to-key="ranger.service.https.attrib.keystore.pass" default-value="" mask="true"/>
-            <transfer operation="copy" from-type="ranger-site" from-key="HTTPS_KEY_ALIAS"
+            <transfer operation="copy" from-type="ranger-site" from-key="https.attrib.keyAlias"
                       to-key="ranger.service.https.attrib.keystore.keyalias" default-value=""/>
-            <transfer operation="copy" from-type="ranger-site" from-key="HTTPS_SERVICE_PORT"
+            <transfer operation="copy" from-type="ranger-site" from-key="https.service.port"
                       to-key="ranger.service.https.port" default-value=""/>
-            <transfer operation="copy" from-type="ranger-site" from-key="HTTP_ENABLED"
+            <transfer operation="copy" from-type="ranger-site" from-key="http.enabled"
                       to-key="ranger.service.http.enabled" default-value=""/>
-            <transfer operation="copy" from-type="ranger-site" from-key="HTTP_SERVICE_PORT"
+            <transfer operation="copy" from-type="ranger-site" from-key="http.service.port"
                       to-key="ranger.service.http.port" default-value=""/>
 
             <transfer operation="copy" from-type="admin-properties" from-key="authServiceHostName"
@@ -775,16 +775,6 @@
             <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=""/>
             <set key="ranger.usersync.sleeptimeinmillisbetweensynccycle" value="60000"/>
           </definition>