Repository: ambari Updated Branches: refs/heads/branch-2.5 97fcfb3cb -> 22e4b482a
AMBARI-21190 Populate urlauth filesystem schemes in Ranger hive plugin (mugdha) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/22e4b482 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/22e4b482 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/22e4b482 Branch: refs/heads/branch-2.5 Commit: 22e4b482a9e1c4fb4211de6455def4ace4b29b42 Parents: 97fcfb3 Author: Mugdha Varadkar <mug...@apache.org> Authored: Wed Jun 7 11:57:02 2017 +0530 Committer: Mugdha Varadkar <mug...@apache.org> Committed: Tue Jun 20 10:43:37 2017 +0530 ---------------------------------------------------------------------- .../0.5.0/configuration/ranger-ugsync-site.xml | 3 ++ .../HIVE/configuration/ranger-hive-security.xml | 33 ++++++++++++++++++++ .../stacks/HDP/2.6/upgrades/config-upgrade.xml | 5 +++ .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 4 +++ .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 1 + 5 files changed, 46 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/22e4b482/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/ranger-ugsync-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/ranger-ugsync-site.xml b/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/ranger-ugsync-site.xml index 439c495..331d07b 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/ranger-ugsync-site.xml +++ b/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/ranger-ugsync-site.xml @@ -404,6 +404,9 @@ # a sample value would be (dept=eng) # please customize the value to suit your deployment # default value is empty"</description> + <value-attributes> + <empty-value-valid>true</empty-value-valid> + </value-attributes> <on-ambari-upgrade add="true"/> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/22e4b482/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/ranger-hive-security.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/ranger-hive-security.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/ranger-hive-security.xml new file mode 100644 index 0000000..889a7a3 --- /dev/null +++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/HIVE/configuration/ranger-hive-security.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * 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> + + <property> + <name>ranger.plugin.hive.urlauth.filesystem.schemes</name> + <value>hdfs:,file:,wasb:,adl:</value> + <description>Add urlauth filesystem schemes</description> + <value-attributes> + <empty-value-valid>true</empty-value-valid> + </value-attributes> + <on-ambari-upgrade add="false"/> + </property> + +</configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/22e4b482/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml index 564dead..df97727 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml @@ -56,6 +56,11 @@ <set key="ranger.plugin.hive.ambari.cluster.name" value="{{cluster_name}}" if-type="ranger-hive-audit" if-key="xasecure.audit.destination.solr" if-key-state="present"/> </definition> + <definition xsi:type="configure" id="hdp_2_6_maint_ranger_hive_plugin_urlauth_filesystem_schemes"> + <type>ranger-hive-security</type> + <set key="ranger.plugin.hive.urlauth.filesystem.schemes" value="hdfs:,file:,wasb:,adl:" + if-type="ranger-hive-security" if-key="ranger.plugin.hive.service.name" if-key-state="present"/> + </definition> </changes> </component> </service> http://git-wip-us.apache.org/repos/asf/ambari/blob/22e4b482/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml index 6b827c9..ede267a 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml @@ -303,6 +303,10 @@ <task xsi:type="configure" id="hdp_2_6_maint_ranger_hive_plugin_cluster_name"/> </execute-stage> + <execute-stage service="HIVE" component="HIVE_SERVER" title="Apply config changes for Ranger Hive plugin"> + <task xsi:type="configure" id="hdp_2_6_maint_ranger_hive_plugin_urlauth_filesystem_schemes"/> + </execute-stage> + <!-- HBASE --> <execute-stage service="HBASE" component="HBASE_MASTER" title="Apply config changes for Ranger Hbase plugin"> <task xsi:type="configure" id="hdp_2_6_maint_ranger_hbase_plugin_cluster_name"/> http://git-wip-us.apache.org/repos/asf/ambari/blob/22e4b482/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml index 9227669..b70943b 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml @@ -791,6 +791,7 @@ <component name="HIVE_SERVER"> <pre-upgrade> <task xsi:type="configure" id="hdp_2_6_maint_ranger_hive_plugin_cluster_name"/> + <task xsi:type="configure" id="hdp_2_6_maint_ranger_hive_plugin_urlauth_filesystem_schemes"/> </pre-upgrade> <pre-downgrade/> <!-- no-op to prevent config changes on downgrade --> <upgrade>