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

[21/50] [abbrv] ambari git commit: AMBARI-21743 Delete ranger-solr-plugin-enabled property during Cross Stack Upgrade (mugdha)

AMBARI-21743 Delete ranger-solr-plugin-enabled property during Cross Stack Upgrade (mugdha)

(cherry picked from commit dae9c5d533b71bdfdd9652a9257fa98657e45cde)

Change-Id: I4394e08942c01942eccaedd487eb8fd7d96ad5dd


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

Branch: refs/heads/2.5-maint
Commit: 0c97625222dd3bc3e21fcf04cfce3f77e6d48ef5
Parents: 5e1bfb7
Author: Mugdha Varadkar <mu...@apache.org>
Authored: Thu Aug 17 17:06:39 2017 +0530
Committer: Zuul <re...@hortonworks.com>
Committed: Thu Aug 17 14:14:57 2017 -0700

----------------------------------------------------------------------
 .../stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml         | 4 ++++
 .../BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml | 4 ++++
 2 files changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/0c976252/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml
index 6ed6a11..f55f9fb 100644
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml
@@ -156,6 +156,10 @@
             <type>ranger-env</type>
             <transfer operation="delete" delete-key="bind_anonymous" />
           </definition>
+          <definition xsi:type="configure" id="hdp_2_6_0_0_remove_ranger_solr_plugin_enabled_property">
+            <type>ranger-env</type>
+            <transfer operation="delete" delete-key="ranger-solr-plugin-enabled" if-type="ranger-env" if-key="ranger-solr-plugin-enabled" if-key-state="present" />
+          </definition>
           <definition xsi:type="configure" id="admin_log4j_parameterize" summary="Parameterizing Ranger Log4J Properties">
             <type>admin-log4j</type>
             <set key="ranger_xa_log_maxfilesize" value="256"/>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0c976252/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml
index e5f3690..83968e0 100644
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml
@@ -294,6 +294,10 @@
         <task xsi:type="configure" id="hdp_2_6_0_0_remove_bind_anonymous"/>
       </execute-stage>
 
+      <execute-stage service="RANGER" component="RANGER_ADMIN" title="Apply config changes for Ranger Admin">
+        <task xsi:type="configure" id="hdp_2_6_0_0_remove_ranger_solr_plugin_enabled_property"/>
+      </execute-stage>
+
       <execute-stage service="RANGER" component="RANGER_ADMIN" title="Parameterizing Ranger Admin Log4J Properties">
         <task xsi:type="configure" id="admin_log4j_parameterize">
           <summary>Updating the Ranger admin Log4J properties to include parameterizations</summary>