Repository: ambari Updated Branches: refs/heads/branch-2.4 bf0ff3430 -> 946b3f52a
AMBARI-17187. Fix configuration xml files that don't pass validation (dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/946b3f52 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/946b3f52 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/946b3f52 Branch: refs/heads/branch-2.4 Commit: 946b3f52ab91b0d211795354e6bac26574ad6dee Parents: bf0ff34 Author: Lisnichenko Dmitro <[email protected]> Authored: Mon Jun 13 12:29:14 2016 +0300 Committer: Lisnichenko Dmitro <[email protected]> Committed: Mon Jun 13 12:30:15 2016 +0300 ---------------------------------------------------------------------- .../RANGER/0.6.0/configuration/ranger-env.xml | 3 ++- .../services/ATLAS/configuration/application-properties.xml | 1 + .../2.5/services/ATLAS/configuration/ranger-atlas-audit.xml | 9 +++++++++ .../ATLAS/configuration/ranger-atlas-plugin-properties.xml | 5 +++++ .../ATLAS/configuration/ranger-atlas-policymgr-ssl.xml | 6 ++++++ .../services/ATLAS/configuration/ranger-atlas-security.xml | 7 +++++++ 6 files changed, 30 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/946b3f52/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-env.xml b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-env.xml index 960c575..b1fc537 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-env.xml +++ b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-env.xml @@ -23,7 +23,7 @@ <property> <name>xasecure.audit.destination.db</name> <deleted>true</deleted> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade delete="true"/> </property> <property> <name>ranger_solr_config_set</name> @@ -60,5 +60,6 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> + <on-ambari-upgrade add="true"/> </property> </configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/946b3f52/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 index 20f3173..49b8ce5 100644 --- 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 @@ -220,5 +220,6 @@ <name>ranger-atlas-plugin-enabled</name> </property> </depends-on> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/946b3f52/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/ranger-atlas-audit.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/ranger-atlas-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/ranger-atlas-audit.xml index 9c4ad88..b2b2b89 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/ranger-atlas-audit.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/ranger-atlas-audit.xml @@ -24,6 +24,7 @@ <name>xasecure.audit.is.enabled</name> <value>true</value> <description>Is Audit enabled?</description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -40,6 +41,7 @@ <name>xasecure.audit.destination.hdfs</name> </property> </depends-on> + <on-ambari-upgrade add="true"/> </property> <property> @@ -52,12 +54,14 @@ <name>xasecure.audit.destination.hdfs.dir</name> </property> </depends-on> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.hdfs.batch.filespool.dir</name> <value>/var/log/hadoop/hdfs/audit/hdfs/spool</value> <description>/var/log/hadoop/hdfs/audit/hdfs/spool</description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -74,6 +78,7 @@ <name>xasecure.audit.destination.solr</name> </property> </depends-on> + <on-ambari-upgrade add="true"/> </property> <property> @@ -89,6 +94,7 @@ <name>ranger.audit.solr.urls</name> </property> </depends-on> + <on-ambari-upgrade add="true"/> </property> <property> @@ -101,12 +107,14 @@ <name>ranger.audit.solr.zookeepers</name> </property> </depends-on> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.solr.batch.filespool.dir</name> <value>/var/log/atlas/audit/solr/spool</value> <description>/var/log/atlas/audit/solr/spool</description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -117,6 +125,7 @@ <value-attributes> <type>boolean</type> </value-attributes> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/946b3f52/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/ranger-atlas-plugin-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/ranger-atlas-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/ranger-atlas-plugin-properties.xml index 2fa9448..f3bdc2a 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/ranger-atlas-plugin-properties.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/ranger-atlas-plugin-properties.xml @@ -26,6 +26,7 @@ <display-name>Policy user for Atlas</display-name> <description>This user must be system user and also present at Ranger admin portal</description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -35,6 +36,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> + <on-ambari-upgrade add="true"/> </property> <property> @@ -52,6 +54,7 @@ <type>boolean</type> <overridable>false</overridable> </value-attributes> + <on-ambari-upgrade add="true"/> </property> <property> @@ -60,6 +63,7 @@ <display-name>Ranger repository config user</display-name> <description>Used for repository creation on ranger admin </description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -72,6 +76,7 @@ <value-attributes> <type>password</type> </value-attributes> + <on-ambari-upgrade add="true"/> </property> </configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/946b3f52/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/ranger-atlas-policymgr-ssl.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/ranger-atlas-policymgr-ssl.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/ranger-atlas-policymgr-ssl.xml index 41c8e6a..349c829 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/ranger-atlas-policymgr-ssl.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/ranger-atlas-policymgr-ssl.xml @@ -24,6 +24,7 @@ <name>xasecure.policymgr.clientssl.keystore</name> <value>/usr/hdp/current/atlas-server/conf/ranger-plugin-keystore.jks</value> <description>Java Keystore files</description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -34,12 +35,14 @@ <value-attributes> <type>password</type> </value-attributes> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.policymgr.clientssl.truststore</name> <value>/usr/hdp/current/atlas-server/conf/ranger-plugin-truststore.jks</value> <description>java truststore file</description> + <on-ambari-upgrade add="true"/> </property> <property> @@ -50,18 +53,21 @@ <value-attributes> <type>password</type> </value-attributes> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.policymgr.clientssl.keystore.credential.file</name> <value>jceks://file{{credential_file}}</value> <description>java keystore credential file</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.policymgr.clientssl.truststore.credential.file</name> <value>jceks://file{{credential_file}}</value> <description>java truststore credential file</description> + <on-ambari-upgrade add="true"/> </property> </configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/946b3f52/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/ranger-atlas-security.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/ranger-atlas-security.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/ranger-atlas-security.xml index f520455..5c9f37c 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/ranger-atlas-security.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/ranger-atlas-security.xml @@ -23,42 +23,49 @@ <name>ranger.plugin.atlas.service.name</name> <value>{{repo_name}}</value> <description>Name of the Ranger service containing Atlas policies</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.plugin.atlas.policy.source.impl</name> <value>org.apache.ranger.admin.client.RangerAdminRESTClient</value> <description>Class to retrieve policies from the source</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.plugin.atlas.policy.rest.url</name> <value>{{policymgr_mgr_url}}</value> <description>URL to Ranger Admin</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.plugin.atlas.policy.rest.ssl.config.file</name> <value>/usr/hdp/current/atlas-server/conf/ranger-policymgr-ssl.xml</value> <description>Path to the file containing SSL details to contact Ranger Admin</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.plugin.atlas.policy.pollIntervalMs</name> <value>30000</value> <description>How often to poll for changes in policies?</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.plugin.atlas.policy.cache.dir</name> <value>/etc/ranger/{{repo_name}}/policycache</value> <description>Directory where Ranger policies are cached after successful retrieval from the source</description> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.add-hadoop-authorization</name> <value>true</value> <description>Enable/Disable the default hadoop authorization (based on rwxrwxrwx permission on the resource) if Ranger Authorization fails.</description> + <on-ambari-upgrade add="true"/> </property> </configuration> \ No newline at end of file
