Revert "AMBARI-20308 - Atlas service check fails during EU on wire encrypted cluster (jonathanhurley)"
This reverts commit d8901e26c3f5cf45011d700cb44d73ea67c86d20. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e19f57e8 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e19f57e8 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e19f57e8 Branch: refs/heads/branch-dev-logsearch Commit: e19f57e83c387c21109dfe4bda0e0e146db2e60e Parents: d8901e2 Author: Jonathan Hurley <jhur...@hortonworks.com> Authored: Mon Mar 6 14:19:44 2017 -0500 Committer: Jonathan Hurley <jhur...@hortonworks.com> Committed: Mon Mar 6 14:19:44 2017 -0500 ---------------------------------------------------------------------- .../configuration/application-properties.xml | 42 -------------------- .../stacks/HDP/2.5/upgrades/config-upgrade.xml | 12 ------ .../HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml | 16 +++----- .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 6 --- .../stacks/HDP/2.5/upgrades/upgrade-2.5.xml | 6 --- .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 1 - .../configuration/application-properties.xml | 3 +- 7 files changed, 7 insertions(+), 79 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e19f57e8/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/application-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/application-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/application-properties.xml deleted file mode 100644 index 366ecf6..0000000 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/application-properties.xml +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0"?> -<?xml-stylesheet type="text/xsl" href="configuration.xsl"?> -<!-- -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ ---> -<configuration supports_final="false"> - - <!-- Supported in HDP 2.5.4 --> - <property> - <name>atlas.ssl.exclude.protocols</name> - <display-name>Excluded Wire Encryption Protocols</display-name> - <value>TLSv1.2</value> - <value-attributes> - <empty-value-valid>true</empty-value-valid> - </value-attributes> - <description>A comma-separate list of the wire encryption protocols to exclude when TLS is enabled. Some versions of cURL do not work with TLSv1.2.</description> - <used-by> - <property> - <type>application-properties</type> - <name>atlas.enableTLS</name> - </property> - </used-by> - <on-ambari-upgrade add="false"/> - </property> - -</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/e19f57e8/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 37f2a82..93e0149 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 @@ -136,18 +136,6 @@ </changes> </component> </service> - - <service name="ATLAS"> - <component name="ATLAS_SERVER"> - <changes> - <definition xsi:type="configure" id="hdp_2_5_4_0_atlas_exclude_tls_protocol" summary="Excluding TLS v1.2 Protocol"> - <type>application-properties</type> - <set key="atlas.ssl.exclude.protocols" value="TLSv1.2" if-type="application-properties" if-key="atlas.ssl.exclude.protocols" if-key-state="absent"/> - </definition> - </changes> - </component> - </service> - <service name="OOZIE"> <component name="OOZIE_SERVER"> <changes> http://git-wip-us.apache.org/repos/asf/ambari/blob/e19f57e8/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 e7ada04..5b37375 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 @@ -75,7 +75,7 @@ <service name="FLUME"> <component>FLUME_HANDLER</component> </service> - + <service name="ACCUMULO"> <component>ACCUMULO_TRACER</component> <component>ACCUMULO_GC</component> @@ -300,12 +300,6 @@ <execute-stage service="STORM" component="NIMBUS" title="Apply config changes for Nimbus"> <task xsi:type="configure" id="increase_storm_zookeeper_timeouts"/> </execute-stage> - - <execute-stage service="ATLAS" component="ATLAS_SERVER" title="Updating Atlas TLS Exclude Protocols"> - <task xsi:type="configure" id="hdp_2_5_4_0_atlas_exclude_tls_protocol"> - <summary>Updating Atlas TLS Exclude Protocols to exclude TLS v1.2</summary> - </task> - </execute-stage> </group> <!-- @@ -335,7 +329,7 @@ </task> </execute-stage> </group> - + <!-- Now, restart all of the services. --> <group xsi:type="restart" name="ZOOKEEPER" title="ZooKeeper"> <service-check>false</service-check> @@ -677,7 +671,7 @@ <component>FLUME_HANDLER</component> </service> </group> - + <group xsi:type="restart" name="ACCUMULO" title="Accumulo"> <service-check>false</service-check> <skippable>true</skippable> @@ -706,7 +700,7 @@ <group xsi:type="cluster" name="FINALIZE_PRE_CHECK" title="Finalize {{direction.text.proper}} Pre-Check"> <direction>UPGRADE</direction> - + <execute-stage title="Check Component Versions"> <task xsi:type="server_action" class="org.apache.ambari.server.serveraction.upgrades.ComponentVersionCheckAction" /> </execute-stage> @@ -776,7 +770,7 @@ <function>setup_ranger_java_patches</function> </task> </pre-upgrade> - + <pre-downgrade copy-upgrade="true" /> <upgrade> http://git-wip-us.apache.org/repos/asf/ambari/blob/e19f57e8/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 fe297c3..55e8924 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 @@ -431,12 +431,6 @@ <summary>Updating the Atlas Log4J properties to include parameterizations</summary> </task> </execute-stage> - - <execute-stage service="ATLAS" component="ATLAS_SERVER" title="Updating Atlas TLS Exclude Protocols"> - <task xsi:type="configure" id="hdp_2_5_4_0_atlas_exclude_tls_protocol"> - <summary>Updating Atlas TLS Exclude Protocols to exclude TLS v1.2</summary> - </task> - </execute-stage> <!--KAFKA--> <execute-stage service="KAFKA" component="KAFKA_BROKER" title="Parameterizing Kafka Log4J Properties"> http://git-wip-us.apache.org/repos/asf/ambari/blob/e19f57e8/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 a030adb..15e5536 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 @@ -934,12 +934,6 @@ <service name="ATLAS"> <component name="ATLAS_SERVER"> - <pre-upgrade> - <task xsi:type="configure" id="hdp_2_5_4_0_atlas_exclude_tls_protocol"/> - </pre-upgrade> - - <pre-downgrade/> - <upgrade> <task xsi:type="restart-task"/> </upgrade> http://git-wip-us.apache.org/repos/asf/ambari/blob/e19f57e8/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 97313b5..0c0b08e 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 @@ -1066,7 +1066,6 @@ <component name="ATLAS_SERVER"> <pre-upgrade> <task xsi:type="configure" id="atlas_log4j_parameterize" /> - <task xsi:type="configure" id="hdp_2_5_4_0_atlas_exclude_tls_protocol"/> </pre-upgrade> <pre-downgrade /> <upgrade> http://git-wip-us.apache.org/repos/asf/ambari/blob/e19f57e8/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/configuration/application-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/configuration/application-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/configuration/application-properties.xml index 91de1b0..47e1fb5 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/configuration/application-properties.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/configuration/application-properties.xml @@ -60,7 +60,7 @@ <on-ambari-upgrade add="true"/> </property> - <property> + <property> <name>atlas.sso.knox.browser.useragent</name> <value/> <description/> @@ -92,4 +92,5 @@ </value-attributes> <on-ambari-upgrade add="true"/> </property> + </configuration>
