You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2017/08/09 15:14:11 UTC
[07/21] ambari git commit: AMBARI-21627. ADDENDUM. Cross-stack
upgrade from IOP to HDP,
ranger audit properties need to be deleted (alejandro)
AMBARI-21627. ADDENDUM. Cross-stack upgrade from IOP to HDP, ranger audit properties need to be deleted (alejandro)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/25336440
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/25336440
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/25336440
Branch: refs/heads/branch-feature-AMBARI-21450
Commit: 2533644003a58fa3a6909d10ed184eb9d126fe1c
Parents: f5e9d17
Author: Alejandro Fernandez <af...@hortonworks.com>
Authored: Fri Aug 4 11:14:38 2017 -0700
Committer: Alejandro Fernandez <af...@hortonworks.com>
Committed: Mon Aug 7 14:37:51 2017 -0700
----------------------------------------------------------------------
.../stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml | 11 +++++++++++
.../4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml | 4 ++++
.../stacks/BigInsights/4.2/upgrades/config-upgrade.xml | 10 ++++++++++
.../4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml | 4 ++++
4 files changed, 29 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/25336440/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 f6a21ff..6ed6a11 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
@@ -56,6 +56,17 @@
<type>core-site</type>
<set key="hadoop.custom-extensions.root" value="/hdp/ext/{{major_stack_version}}/hadoop" if-type="core-site" if-key="hadoop.custom-extensions.root" if-key-state="absent"/>
</definition>
+
+ <definition xsi:type="configure" id="hdp_2_6_0_0_remove_ranger_hdfs_audit_db">
+ <type>ranger-knox-audit</type>
+ <transfer operation="delete" delete-key="xasecure.audit.destination.db" />
+ <transfer operation="delete" delete-key="xasecure.audit.destination.db.jdbc.url" />
+ <transfer operation="delete" delete-key="xasecure.audit.destination.db.user" />
+ <transfer operation="delete" delete-key="xasecure.audit.destination.db.password" />
+ <transfer operation="delete" delete-key="xasecure.audit.destination.db.jdbc.driver" />
+ <transfer operation="delete" delete-key="xasecure.audit.credential.provider.file" />
+ <transfer operation="delete" delete-key="xasecure.audit.destination.db.batch.filespool.dir" />
+ </definition>
</changes>
</component>
</service>
http://git-wip-us.apache.org/repos/asf/ambari/blob/25336440/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 361fb56..e5f3690 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
@@ -234,6 +234,10 @@
</task>
</execute-stage>
+ <execute-stage service="YARN" component="NAMENODE" title="Apply config changes for HDFS related to Ranger">
+ <task xsi:type="configure" id="hdp_2_6_0_0_remove_ranger_hdfs_audit_db"/>
+ </execute-stage>
+
<!-- core-site -->
<execute-stage title="Fix auth_to_local mapping">
<condition xsi:type="security" type="kerberos"/>
http://git-wip-us.apache.org/repos/asf/ambari/blob/25336440/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml
index 566bcd6..42fdca5 100644
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml
@@ -145,6 +145,16 @@
<set key="hadoop.custom-extensions.root" value="/hdp/ext/{{major_stack_version}}/hadoop" if-type="core-site" if-key="hadoop.custom-extensions.root" if-key-state="absent"/>
</definition>
+ <definition xsi:type="configure" id="hdp_2_6_0_0_remove_ranger_hdfs_audit_db">
+ <type>ranger-knox-audit</type>
+ <transfer operation="delete" delete-key="xasecure.audit.destination.db" />
+ <transfer operation="delete" delete-key="xasecure.audit.destination.db.jdbc.url" />
+ <transfer operation="delete" delete-key="xasecure.audit.destination.db.user" />
+ <transfer operation="delete" delete-key="xasecure.audit.destination.db.password" />
+ <transfer operation="delete" delete-key="xasecure.audit.destination.db.jdbc.driver" />
+ <transfer operation="delete" delete-key="xasecure.audit.credential.provider.file" />
+ <transfer operation="delete" delete-key="xasecure.audit.destination.db.batch.filespool.dir" />
+ </definition>
</changes>
</component>
</service>
http://git-wip-us.apache.org/repos/asf/ambari/blob/25336440/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml
index bfed19d..b8c23bb 100644
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml
@@ -223,6 +223,10 @@
</task>
</execute-stage>
+ <execute-stage service="YARN" component="NAMENODE" title="Apply config changes for HDFS related to Ranger">
+ <task xsi:type="configure" id="hdp_2_6_0_0_remove_ranger_hdfs_audit_db"/>
+ </execute-stage>
+
<!-- core-site -->
<execute-stage title="Fix auth_to_local mapping">
<condition xsi:type="security" type="kerberos"/>