AMBARI-21419 EU to auto switch to HDP tomcat for Oozie (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4302da15 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4302da15 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4302da15 Branch: refs/heads/branch-2.5 Commit: 4302da1500fb8c936d728a2b32937fb282f3c1d1 Parents: e512d10 Author: Di Li <[email protected]> Authored: Thu Jul 6 16:51:23 2017 -0400 Committer: Di Li <[email protected]> Committed: Thu Jul 6 16:51:23 2017 -0400 ---------------------------------------------------------------------- .../stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml | 4 ++++ .../BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml | 3 +++ .../resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml | 4 ++++ .../BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml | 3 +++ 4 files changed, 14 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/4302da15/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 419e5dd..6597055 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 @@ -112,6 +112,10 @@ <type>oozie-env</type> <replace key="content" find="export CATALINA_BASE=${CATALINA_BASE:-{{oozie_server_dir}}}" replace-with="export CATALINA_BASE={{oozie_server_dir}}" /> </definition> + <definition xsi:type="configure" id="biginsights_4_2_oozie_server_update_environment_tomcat" summary="Updating oozie env"> + <type>oozie-site</type> + <replace key="content" find="/usr/lib/bigtop-tomcat7-7.0.75" replace-with="/usr/lib/bigtop-tomcat" /> + </definition> </changes> </component> </service> http://git-wip-us.apache.org/repos/asf/ambari/blob/4302da15/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 c4737c9..af87794 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 @@ -204,6 +204,9 @@ <execute-stage service="OOZIE" component="OOZIE_SERVER" title="Apply config changes for Oozie server"> <task xsi:type="configure" id="biginsights_4_2_oozie_server_update_environment_configurations" /> </execute-stage> + <execute-stage service="OOZIE" component="OOZIE_SERVER" title="Apply config changes for Oozie server"> + <task xsi:type="configure" id="biginsights_4_2_oozie_server_update_environment_tomcat" /> + </execute-stage> </group> http://git-wip-us.apache.org/repos/asf/ambari/blob/4302da15/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 419e5dd..6597055 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 @@ -112,6 +112,10 @@ <type>oozie-env</type> <replace key="content" find="export CATALINA_BASE=${CATALINA_BASE:-{{oozie_server_dir}}}" replace-with="export CATALINA_BASE={{oozie_server_dir}}" /> </definition> + <definition xsi:type="configure" id="biginsights_4_2_oozie_server_update_environment_tomcat" summary="Updating oozie env"> + <type>oozie-site</type> + <replace key="content" find="/usr/lib/bigtop-tomcat7-7.0.75" replace-with="/usr/lib/bigtop-tomcat" /> + </definition> </changes> </component> </service> http://git-wip-us.apache.org/repos/asf/ambari/blob/4302da15/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 c4737c9..af87794 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 @@ -204,6 +204,9 @@ <execute-stage service="OOZIE" component="OOZIE_SERVER" title="Apply config changes for Oozie server"> <task xsi:type="configure" id="biginsights_4_2_oozie_server_update_environment_configurations" /> </execute-stage> + <execute-stage service="OOZIE" component="OOZIE_SERVER" title="Apply config changes for Oozie server"> + <task xsi:type="configure" id="biginsights_4_2_oozie_server_update_environment_tomcat" /> + </execute-stage> </group>
