Repository: ambari Updated Branches: refs/heads/branch-2.6 7ef365215 -> 395cf3b59
AMBARI-21912.Make Ambari changes for external-conf(Prabhjyot Singh via Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/395cf3b5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/395cf3b5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/395cf3b5 Branch: refs/heads/branch-2.6 Commit: 395cf3b5924755c826d46e6966d15cf6b8d81cdf Parents: 7ef3652 Author: Venkata Sairam <[email protected]> Authored: Mon Sep 18 12:22:05 2017 +0530 Committer: Venkata Sairam <[email protected]> Committed: Mon Sep 18 12:22:42 2017 +0530 ---------------------------------------------------------------------- .../stacks/HDP/2.5/upgrades/config-upgrade.xml | 13 +++++++++++++ .../stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml | 5 +++++ .../stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 5 +++++ .../resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml | 7 ++++++- .../resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 7 ++++++- 5 files changed, 35 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/395cf3b5/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml index 75a8782..5618e14 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml @@ -566,5 +566,18 @@ </component> </service> + <service name="ZEPPELIN"> + <component name="ZEPPELIN_MASTER"> + <changes> + <definition xsi:type="configure" id="hdp_2_5_0_0__zeppelin_external_dependency_configs" summary="Apply external depedency config 1"> + <type>zeppelin-env</type> + <insert key="zeppelin_env_content" + value='export ZEPPELIN_INTP_CLASSPATH_OVERRIDES="{{external_dependency_conf}}"' + insert-type="append" newline-before="true" newline-after="true"/> + </definition> + </changes> + </component> + </service> + </services> </upgrade-config-changes> http://git-wip-us.apache.org/repos/asf/ambari/blob/395cf3b5/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml index 07bc8a4..9f77065 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml @@ -271,6 +271,11 @@ <direction>UPGRADE</direction> <!-- prevent config changes on downgrade --> <skippable>true</skippable> <!-- May fix configuration problems manually --> + <!-- ZEPPELIN --> + <execute-stage service="ZEPPELIN" component="ZEPPELIN_MASTER" title="Apply external depedency config 2"> + <task xsi:type="configure" id="hdp_2_5_0_0__zeppelin_external_dependency_configs"/> + </execute-stage> + <!-- HDFS --> <execute-stage service="HDFS" component="NAMENODE" title="Prevent Garbage Collection Heuristics"> <task xsi:type="configure" id="hdfs_namenode_prevent_gc_heuristics"/> http://git-wip-us.apache.org/repos/asf/ambari/blob/395cf3b5/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml index 850f725..8824de5 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml @@ -276,6 +276,11 @@ <direction>UPGRADE</direction> <!-- prevent config changes on downgrade --> <skippable>true</skippable> <!-- May fix configuration problems manually --> + <!-- ZEPPELIN --> + <execute-stage service="ZEPPELIN" component="ZEPPELIN_MASTER" title="Apply external depedency config 3"> + <task xsi:type="configure" id="hdp_2_5_0_0__zeppelin_external_dependency_configs"/> + </execute-stage> + <!--HDFS--> <execute-stage service="HDFS" component="NAMENODE" title="Apply config changes for Hdfs NameNode"> <task xsi:type="configure" id="hdfs_securitylogger_additivity"/> http://git-wip-us.apache.org/repos/asf/ambari/blob/395cf3b5/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml index 9a42098..a6d7a49 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml @@ -806,8 +806,13 @@ <service name="ZEPPELIN"> <component name="ZEPPELIN_MASTER"> + <pre-upgrade> + <task xsi:type="configure" id="hdp_2_5_0_0__zeppelin_external_dependency_configs"/> + </pre-upgrade> + <pre-downgrade/> + <upgrade> - <task xsi:type="restart-task" /> + <task xsi:type="restart-task"/> </upgrade> </component> </service> http://git-wip-us.apache.org/repos/asf/ambari/blob/395cf3b5/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml index ea58559..2a61034 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml @@ -952,8 +952,13 @@ <service name="ZEPPELIN"> <component name="ZEPPELIN_MASTER"> + <pre-upgrade> + <task xsi:type="configure" id="hdp_2_5_0_0__zeppelin_external_dependency_configs"/> + </pre-upgrade> + <pre-downgrade/> + <upgrade> - <task xsi:type="restart-task" /> + <task xsi:type="restart-task"/> </upgrade> </component> </service>
