ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smoha...@apache.org
Subject ambari git commit: AMBARI-14169. SYNC SOURCE property needs to be maintained for RU (2.2.x to 2.3.x) (Gautam Borad via smohanty)
Date Fri, 04 Dec 2015 23:59:50 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 046dfd44f -> bf9d6b23b


AMBARI-14169. SYNC SOURCE property needs to be maintained for RU (2.2.x to 2.3.x) (Gautam
Borad via smohanty)


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

Branch: refs/heads/branch-2.2
Commit: bf9d6b23b50720e8fa36bcef490a4c7cdd90be3f
Parents: 046dfd4
Author: Sumit Mohanty <smohanty@hortonworks.com>
Authored: Fri Dec 4 15:58:23 2015 -0800
Committer: Sumit Mohanty <smohanty@hortonworks.com>
Committed: Fri Dec 4 15:59:31 2015 -0800

----------------------------------------------------------------------
 .../0.4.0/configuration/usersync-properties.xml |  4 ---
 .../HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml | 12 +++++++
 .../stacks/HDP/2.2/upgrades/upgrade-2.3.xml     |  6 ++++
 .../stacks/HDP/2.3/upgrades/config-upgrade.xml  | 37 ++++++++++++++++++--
 4 files changed, 53 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/bf9d6b23/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 007f6a4..87e1f00 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
@@ -34,10 +34,6 @@
           <label>UNIX</label>
         </entry>
         <entry>
-          <value>file</value>
-          <label>FILE</label>
-        </entry>
-        <entry>
           <value>ldap</value>
           <label>LDAP/AD</label>
         </entry>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bf9d6b23/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml
b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml
index 98e8e4f..803f3db 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml
@@ -287,6 +287,10 @@
       </execute-stage>
 
       <execute-stage service="RANGER" component="RANGER_ADMIN" title="Apply config changes
for Ranger">
+        <task xsi:type="configure" id="hdp_2_3_0_0_update_ranger_usersync_sync_source"/>
+      </execute-stage>
+
+      <execute-stage service="RANGER" component="RANGER_ADMIN" title="Apply config changes
for Ranger">
         <task xsi:type="configure" id="hdp_2_3_0_0_update_ranger_usersync_properties"/>
       </execute-stage>
 
@@ -294,6 +298,14 @@
         <task xsi:type="configure" id="hdp_2_3_0_0_update_ranger_delete_oracle_home"/>
       </execute-stage>
 
+      <execute-stage service="RANGER" component="RANGER_ADMIN" title="Apply config changes
for Ranger">
+        <task xsi:type="configure" id="hdp_2_3_0_0_update_ranger_admin_hdfs_audit"/>
+      </execute-stage>
+
+      <execute-stage service="RANGER" component="RANGER_ADMIN" title="Apply config changes
for Ranger">
+        <task xsi:type="configure" id="hdp_2_3_0_0_update_ranger_admin_db_audit"/>
+      </execute-stage>
+
       <!--HDFS-->
       <execute-stage service="HDFS" component="NAMENODE" title="Apply config changes for
NameNode">
         <task xsi:type="configure" id="hdp_2_3_0_0_namenode_ha_adjustments"/>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bf9d6b23/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 88eb9ac..cd82a08 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
@@ -448,9 +448,15 @@
             
           <task xsi:type="configure" id="hdp_2_3_0_0_update_ranger_site"/>
 
+          <task xsi:type="configure" id="hdp_2_3_0_0_update_ranger_usersync_sync_source"/>
+
           <task xsi:type="configure" id="hdp_2_3_0_0_update_ranger_usersync_properties"/>
 
           <task xsi:type="configure" id="hdp_2_3_0_0_update_ranger_delete_oracle_home"/>
+
+          <task xsi:type="configure" id="hdp_2_3_0_0_update_ranger_admin_hdfs_audit"/>
+
+          <task xsi:type="configure" id="hdp_2_3_0_0_update_ranger_admin_db_audit"/>
         </pre-upgrade>
       
         <upgrade>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bf9d6b23/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
index 54236cf..ffb65e8 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
@@ -23,12 +23,13 @@
     <service name="RANGER">
       <component name="RANGER_ADMIN">
         <changes>
-          <definition id="hdp_2_3_0_0_update_ranger_env">
+          <definition xsi:type="configure" id="hdp_2_3_0_0_update_ranger_env">
             <type>ranger-env</type>
             <set key="xml_configurations_supported" value="true" />
+            <set key="xasecure.audit.destination.solr" value="false" />
           </definition>
 
-          <definition id="hdp_2_3_0_0_update_ranger_admin" summary="Updating Ranger Admin">
+          <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"
to-key="ranger.service.https.attrib.clientAuth" default-value="" />
             <transfer operation="copy" from-type="ranger-site" from-key="HTTPS_KEYSTORE_FILE"
to-key="ranger.https.attrib.keystore.file" default-value="" />
@@ -55,6 +56,7 @@
             <transfer operation="copy" from-type="admin-properties" from-key="audit_db_password"
to-key="ranger.jpa.audit.jdbc.password" default-value="" mask="true" />
 
             <set key="ranger.externalurl" value="{{ranger_external_url}}" />
+            <set key="ranger.audit.source.type" value="db" />
           </definition>
 
           <definition xsi:type="configure" id="hdp_2_3_0_0_update_ranger_site">
@@ -72,6 +74,23 @@
             <type>ranger-env</type>
             <transfer operation="delete" delete-key="oracle_home" />
           </definition>
+
+          <definition xsi:type="configure" id="hdp_2_3_0_0_update_ranger_admin_hdfs_audit">
+            <condition type="ranger-env" key="xasecure.audit.destination.hdfs" value="false">
+              <type>ranger-env</type>
+              <key>xasecure.audit.destination.hdfs</key>
+              <value>false</value>
+            </condition>
+          </definition>
+
+          <definition xsi:type="configure" id="hdp_2_3_0_0_update_ranger_admin_db_audit">
+            <condition type="ranger-env" key="xasecure.audit.destination.db" value="true">
+              <type>ranger-env</type>
+              <key>xasecure.audit.destination.db</key>
+              <value>true</value>
+            </condition>
+          </definition>
+
         </changes>
       </component>
 
@@ -109,6 +128,20 @@
             <set key="ranger.usersync.sleeptimeinmillisbetweensynccycle" value="60000"
/>
           </definition>
 
+          <definition xsi:type="configure" id="hdp_2_3_0_0_update_ranger_usersync_sync_source">
+            <condition type="usersync-properties" key="SYNC_SOURCE" value="unix">
+              <type>ranger-ugsync-site</type>
+              <key>ranger.usersync.source.impl.class</key>
+              <value>org.apache.ranger.unixusersync.process.UnixUserGroupBuilder</value>
+            </condition>
+
+            <condition type="usersync-properties" key="SYNC_SOURCE" value="ldap">
+              <type>ranger-ugsync-site</type>
+              <key>ranger.usersync.source.impl.class</key>
+              <value>org.apache.ranger.ldapusersync.process.LdapUserGroupBuilder</value>
+            </condition>
+          </definition>
+
           <definition xsi:type="configure" id="hdp_2_3_0_0_update_ranger_usersync_properties">
             <type>usersync-properties</type>
             <transfer operation="delete" delete-key="CRED_KEYSTORE_FILENAME" />


Mime
View raw message