AMBARI-20570. Remove property atlas.cluster.name from hive-site for fresh deployments (smohanty)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b96b8152 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b96b8152 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b96b8152 Branch: refs/heads/branch-3.0-perf Commit: b96b81525d72dd61a4865ef0e9ae7361b557ccd0 Parents: 82d81ea Author: Sumit Mohanty <[email protected]> Authored: Fri Mar 24 20:31:18 2017 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Fri Mar 24 20:31:18 2017 -0700 ---------------------------------------------------------------------- .../HIVE/2.1.0.3.0/configuration/hive-site.xml | 11 ----------- .../HDP/2.5/services/HIVE/configuration/hive-site.xml | 5 +++++ 2 files changed, 5 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b96b8152/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/configuration/hive-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/configuration/hive-site.xml b/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/configuration/hive-site.xml index 98dbe8d..edbbc9d 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/configuration/hive-site.xml +++ b/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/configuration/hive-site.xml @@ -53,17 +53,6 @@ limitations under the License. <on-ambari-upgrade add="false"/> </property> <property> - <name>atlas.cluster.name</name> - <value>{{cluster_name}}</value> - <depends-on> - <property> - <type>application-properties</type> - <name>atlas.enableTLS</name> - </property> - </depends-on> - <on-ambari-upgrade add="false"/> - </property> - <property> <name>hive.metastore.sasl.enabled</name> <value>false</value> <description>If true, the metastore thrift interface will be secured with SASL. http://git-wip-us.apache.org/repos/asf/ambari/blob/b96b8152/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-site.xml index cd19519..f0b945a 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-site.xml @@ -24,4 +24,9 @@ limitations under the License. <deleted>true</deleted> <on-ambari-upgrade add="false"/> </property> + <property> + <name>atlas.cluster.name</name> + <on-ambari-upgrade add="false"/> + <deleted>true</deleted> + </property> </configuration>
