AMBARI-21635 Show Audit to DB removal pre-check message during cross stack upgrade (mugdha)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d322f9d7 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d322f9d7 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d322f9d7 Branch: refs/heads/branch-feature-AMBARI-21450 Commit: d322f9d7b206b8f26479965f72aed52b4e6f2dd5 Parents: 266deaf Author: Mugdha Varadkar <[email protected]> Authored: Wed Aug 2 10:33:42 2017 +0530 Committer: Mugdha Varadkar <[email protected]> Committed: Thu Aug 3 10:36:27 2017 +0530 ---------------------------------------------------------------------- .../4.0/properties/stack_features.json | 31 ++++++++++++++++++-- .../BigInsights/4.2/upgrades/config-upgrade.xml | 6 ---- .../upgrades/nonrolling-upgrade-to-hdp-2.6.xml | 6 +--- 3 files changed, 29 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/d322f9d7/ambari-server/src/main/resources/stacks/BigInsights/4.0/properties/stack_features.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/properties/stack_features.json b/ambari-server/src/main/resources/stacks/BigInsights/4.0/properties/stack_features.json index a6672e4..bf00f13 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/properties/stack_features.json +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/properties/stack_features.json @@ -95,7 +95,7 @@ { "name": "ranger_usersync_non_root", "description": "Ranger Usersync as non-root user (AMBARI-10416)", - "min_version": "4.1.0.0" + "min_version": "4.2.0.0" }, { "name": "ranger_audit_db_support", @@ -185,8 +185,8 @@ "min_version": "4.2.5.0" }, { - "name": "ranger_install_logsearch_client", - "description": "LogSearch Service support", + "name": "ranger_install_infra_client", + "description": "Ambari Infra Service support", "min_version": "4.2.5.0" }, { @@ -208,6 +208,31 @@ "name": "ranger_kms_pid_support", "description": "Ranger KMS Service support pid generation", "min_version": "4.2.5.0" + }, + { + "name": "ranger_admin_password_change", + "description": "Allow ranger admin credentials to be specified during cluster creation (AMBARI-17000)", + "min_version": "4.2.5.0" + }, + { + "name": "ranger_hive_plugin_jdbc_url", + "description": "Handle Ranger hive repo config jdbc url change for stack 2.5 (AMBARI-18386)", + "min_version": "4.2.5.0" + }, + { + "name": "ranger_xml_configuration", + "description": "Ranger code base support xml configurations", + "min_version": "4.2.0.0" + }, + { + "name": "kafka_ranger_plugin_support", + "description": "Ambari stack changes for Ranger Kafka Plugin (AMBARI-11299)", + "min_version": "4.2.0.0" + }, + { + "name": "yarn_ranger_plugin_support", + "description": "Implement Stack changes for Ranger Yarn Plugin integration (AMBARI-10866)", + "min_version": "4.2.0.0" } ] } http://git-wip-us.apache.org/repos/asf/ambari/blob/d322f9d7/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 f544e10..566bcd6 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 @@ -51,12 +51,6 @@ <transfer operation="delete" delete-key="ranger.sso.query.param.originalurl" /> </definition> - <definition xsi:type="configure" id="hdp_2_5_0_0_set_external_solrCloud_flag"> - <type>ranger-env</type> - <set key="is_external_solrCloud_enabled" value="true" - if-type="ranger-env" if-key="is_solrCloud_enabled" if-value="true"/> - </definition> - <definition xsi:type="configure" id="hdp_2_6_0_0_remove_bind_anonymous"> <type>ranger-env</type> <transfer operation="delete" delete-key="bind_anonymous" /> http://git-wip-us.apache.org/repos/asf/ambari/blob/d322f9d7/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 6e7c2e4..bfed19d 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 @@ -23,6 +23,7 @@ <downgrade-allowed>false</downgrade-allowed> <type>NON_ROLLING</type> <prerequisite-checks> + <check>org.apache.ambari.server.checks.RangerAuditDbCheck</check> <check>org.apache.ambari.server.checks.ServicesYarnWorkPreservingCheck</check> <check>org.apache.ambari.server.checks.JavaVersionCheck</check> <check>org.apache.ambari.server.checks.RangerSSLConfigCheck</check> @@ -156,7 +157,6 @@ <service name="RANGER"> <component>RANGER_USERSYNC</component> <component>RANGER_ADMIN</component> - <component>RANGER_TAGSYNC</component> </service> <service name="RANGER_KMS"> @@ -341,10 +341,6 @@ <task xsi:type="configure" id="hdp_2_5_0_0_remove_sso_property"/> </execute-stage> - <execute-stage service="RANGER" component="RANGER_ADMIN" title="Apply config changes for Ranger Admin"> - <task xsi:type="configure" id="hdp_2_5_0_0_set_external_solrCloud_flag"/> - </execute-stage> - <execute-stage service="RANGER" component="RANGER_ADMIN" title="Calculating Ranger Properties"> <condition xsi:type="security" type="kerberos"/> <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.RangerKerberosConfigCalculation">
