Repository: ambari Updated Branches: refs/heads/trunk cb46f39ee -> 8c104df93
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/8c104df9 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8c104df9 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8c104df9 Branch: refs/heads/trunk Commit: 8c104df93ae5d3732c6bfd3657b803985f2c0553 Parents: cb46f39 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:05 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/8c104df9/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 f5fa744..bd69f1e 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 @@ -558,5 +558,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/8c104df9/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 b79f644..b25db24 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/8c104df9/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 c509f34..12d2832 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/8c104df9/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 f3b1fa6..35f564e 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/8c104df9/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 5f1bf12..32822a7 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>
