http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c95413/ambari-server/src/main/resources/stacks/HDP/2.3/services/TEZ/configuration/tez-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/TEZ/configuration/tez-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/TEZ/configuration/tez-site.xml index 78d5cf9..a746471 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/TEZ/configuration/tez-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/TEZ/configuration/tez-site.xml @@ -26,8 +26,8 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>tez.runtime.optimize.local.fetch</name> @@ -36,8 +36,8 @@ <value-attributes> <type>boolean</type> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>tez.task.generate.counters.per.io</name> @@ -46,8 +46,8 @@ <value-attributes> <type>boolean</type> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>tez.runtime.sorter.class</name> @@ -67,8 +67,8 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>tez.runtime.pipelined.sorter.sort.threads</name> @@ -83,8 +83,8 @@ <name>tez.runtime.sorter.class</name> </property> </depends-on> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>tez.runtime.io.sort.mb</name> @@ -100,27 +100,27 @@ <name>tez.runtime.sorter.class</name> </property> </depends-on> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>tez.history.logging.service.class</name> <value>org.apache.tez.dag.history.logging.ats.ATSV15HistoryLoggingService</value> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>tez.counters.max</name> <value>10000</value> <description>The number of allowed counters for the executing DAG</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>tez.counters.max.groups</name> <value>3000</value> <description>The number of allowed counter groups for the executing DAG</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> </configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c95413/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration-mapred/mapred-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration-mapred/mapred-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration-mapred/mapred-site.xml index 59f1f25..71fdf54 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration-mapred/mapred-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration-mapred/mapred-site.xml @@ -25,8 +25,8 @@ server state upon startup. If enabled then mapreduce.jobhistory.recovery.store.class must be specified. </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>mapreduce.jobhistory.recovery.store.class</name> @@ -34,8 +34,8 @@ <description>The HistoryServerStateStoreService class to store history server state for recovery. </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>mapreduce.jobhistory.recovery.store.leveldb.path</name> @@ -43,7 +43,7 @@ <description>The URI where history server state will be stored if HistoryServerLeveldbSystemStateStoreService is configured as the recovery storage class. </description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c95413/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/capacity-scheduler.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/capacity-scheduler.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/capacity-scheduler.xml index 9b1057a..54241ee 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/capacity-scheduler.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/capacity-scheduler.xml @@ -19,7 +19,7 @@ <property> <name>yarn.scheduler.capacity.root.default-node-label-expression</name> <deleted>true</deleted> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c95413/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-audit.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-audit.xml index d2cd072..7aaf43b 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-audit.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-audit.xml @@ -23,8 +23,8 @@ <name>xasecure.audit.is.enabled</name> <value>true</value> <description>Is Audit enabled?</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>xasecure.audit.destination.db</name> @@ -40,22 +40,22 @@ <name>xasecure.audit.destination.db</name> </property> </depends-on> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>xasecure.audit.destination.db.jdbc.url</name> <value>{{audit_jdbc_url}}</value> <description>Audit DB JDBC URL</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>xasecure.audit.destination.db.user</name> <value>{{xa_audit_db_user}}</value> <description>Audit DB JDBC User</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>xasecure.audit.destination.db.password</name> @@ -65,29 +65,29 @@ <value-attributes> <type>password</type> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>xasecure.audit.destination.db.jdbc.driver</name> <value>{{jdbc_driver}}</value> <description>Audit DB JDBC Driver</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>xasecure.audit.credential.provider.file</name> <value>jceks://file{{credential_file}}</value> <description>Credential file store</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>xasecure.audit.destination.db.batch.filespool.dir</name> <value>/var/log/hadoop/yarn/audit/db/spool</value> <description>/var/log/hadoop/yarn/audit/db/spool</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>xasecure.audit.destination.hdfs</name> @@ -103,8 +103,8 @@ <name>xasecure.audit.destination.hdfs</name> </property> </depends-on> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>xasecure.audit.destination.hdfs.dir</name> @@ -116,15 +116,15 @@ <name>xasecure.audit.destination.hdfs.dir</name> </property> </depends-on> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>xasecure.audit.destination.hdfs.batch.filespool.dir</name> <value>/var/log/hadoop/yarn/audit/hdfs/spool</value> <description>/var/log/hadoop/yarn/audit/hdfs/spool</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>xasecure.audit.destination.solr</name> @@ -140,8 +140,8 @@ <name>xasecure.audit.destination.solr</name> </property> </depends-on> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>xasecure.audit.destination.solr.urls</name> @@ -156,8 +156,8 @@ <name>ranger.audit.solr.urls</name> </property> </depends-on> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>xasecure.audit.destination.solr.zookeepers</name> @@ -169,15 +169,15 @@ <name>ranger.audit.solr.zookeepers</name> </property> </depends-on> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>xasecure.audit.destination.solr.batch.filespool.dir</name> <value>/var/log/hadoop/yarn/audit/solr/spool</value> <description>/var/log/hadoop/yarn/audit/solr/spool</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>xasecure.audit.provider.summary.enabled</name> @@ -187,7 +187,7 @@ <value-attributes> <type>boolean</type> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c95413/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-plugin-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-plugin-properties.xml index d633bf1..48f116f 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-plugin-properties.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-plugin-properties.xml @@ -24,8 +24,8 @@ <value>ambari-qa</value> <display-name>Policy user for YARN</display-name> <description>This user must be system user and also present at Ranger admin portal</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>hadoop.rpc.protection</name> @@ -34,8 +34,8 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>common.name.for.certificate</name> @@ -44,8 +44,8 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>ranger-yarn-plugin-enabled</name> @@ -62,16 +62,16 @@ <type>boolean</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>REPOSITORY_CONFIG_USERNAME</name> <value>yarn</value> <display-name>Ranger repository config user</display-name> <description>Used for repository creation on ranger admin</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>REPOSITORY_CONFIG_PASSWORD</name> @@ -82,7 +82,7 @@ <value-attributes> <type>password</type> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c95413/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-policymgr-ssl.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-policymgr-ssl.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-policymgr-ssl.xml index 39dd3c9..01e2bf4 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-policymgr-ssl.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-policymgr-ssl.xml @@ -23,8 +23,8 @@ <name>xasecure.policymgr.clientssl.keystore</name> <value>/usr/hdp/current/hadoop-client/conf/ranger-yarn-plugin-keystore.jks</value> <description>Java Keystore files</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>xasecure.policymgr.clientssl.keystore.password</name> @@ -34,15 +34,15 @@ <value-attributes> <type>password</type> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>xasecure.policymgr.clientssl.truststore</name> <value>/usr/hdp/current/hadoop-client/conf/ranger-yarn-plugin-truststore.jks</value> <description>java truststore file</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>xasecure.policymgr.clientssl.truststore.password</name> @@ -52,21 +52,21 @@ <value-attributes> <type>password</type> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </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="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </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="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c95413/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-security.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-security.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-security.xml index 77565c2..eee528f 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-security.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-security.xml @@ -23,42 +23,42 @@ <name>ranger.plugin.yarn.service.name</name> <value>{{repo_name}}</value> <description>Name of the Ranger service containing policies for this Yarn instance</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>ranger.plugin.yarn.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="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>ranger.plugin.yarn.policy.rest.url</name> <value>{{policymgr_mgr_url}}</value> <description>URL to Ranger Admin</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>ranger.plugin.yarn.policy.rest.ssl.config.file</name> <value>/etc/hadoop/conf/ranger-policymgr-ssl-yarn.xml</value> <description>Path to the file containing SSL details to contact Ranger Admin</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>ranger.plugin.yarn.policy.pollIntervalMs</name> <value>30000</value> <description>How often to poll for changes in policies?</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>ranger.plugin.yarn.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="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c95413/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml index b517f91..3ed9095 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml @@ -23,8 +23,8 @@ <name>is_supported_yarn_ranger</name> <value>true</value> <description>Set to false by default, needs to be set to true in stacks that use Ranger Yarn Plugin</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <!-- yarn-env.sh --> <property> @@ -156,7 +156,7 @@ <value-attributes> <type>content</type> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c95413/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml index ef84187..6a5d2ed 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml @@ -98,7 +98,7 @@ log4j.appender.NMAUDIT.DatePattern=.yyyy-MM-dd <type>content</type> <show-property-name>false</show-property-name> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c95413/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml index 7112a18..8f05d57 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml @@ -21,14 +21,14 @@ <property> <name>yarn.node-labels.manager-class</name> <deleted>true</deleted> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.timeline-service.recovery.enabled</name> <value>true</value> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.acl.enable</name> @@ -40,8 +40,8 @@ <name>ranger-yarn-plugin-enabled</name> </property> </depends-on> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.authorization-provider</name> @@ -52,8 +52,8 @@ <name>ranger-yarn-plugin-enabled</name> </property> </depends-on> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.admin.acl</name> @@ -62,37 +62,37 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <!--ats v1.5 properties--> <property> <name>yarn.timeline-service.version</name> <value>1.5</value> <description>Timeline service version we’re currently using.</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.timeline-service.store-class</name> <value>org.apache.hadoop.yarn.server.timeline.EntityGroupFSTimelineStore</value> <description>Main storage class for YARN timeline server.</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.timeline-service.entity-group-fs-store.active-dir</name> <value>/ats/active/</value> <description>DFS path to store active application’s timeline data</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.timeline-service.entity-group-fs-store.done-dir</name> <value>/ats/done/</value> <description>DFS path to store done application’s timeline data</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.timeline-service.entity-group-fs-store.group-id-plugin-classes</name> @@ -101,36 +101,36 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <!-- advanced ats v1.5 properties--> <property> <name>yarn.timeline-service.entity-group-fs-store.summary-store</name> <!-- Use rolling leveldb, advanced --> <value>org.apache.hadoop.yarn.server.timeline.RollingLevelDBTimelineStore</value> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.timeline-service.entity-group-fs-store.scan-interval-seconds</name> <!-- Default is 60 seconds, advanced --> <value>60</value> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.timeline-service.entity-group-fs-store.cleaner-interval-seconds</name> <!-- 3600 is default, advanced --> <value>3600</value> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.timeline-service.entity-group-fs-store.retain-seconds</name> <!-- 7 days is default, advanced --> <value>604800</value> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c95413/ambari-server/src/main/resources/stacks/HDP/2.4/services/YARN/configuration/yarn-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/YARN/configuration/yarn-site.xml index 43eadea..579b408 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/YARN/configuration/yarn-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/YARN/configuration/yarn-site.xml @@ -22,14 +22,14 @@ <value>mapreduce_shuffle,spark_shuffle</value> <description>Auxilliary services of NodeManager. A valid service name should only contain a-zA-Z0-9_ and can not start with numbers</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>yarn.nodemanager.aux-services.spark_shuffle.class</name> <value>org.apache.spark.network.yarn.YarnShuffleService</value> <description>The auxiliary service class to use for Spark</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c95413/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 98cbc30..126b3e8 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 @@ -24,8 +24,8 @@ <name>atlas.server.ha.enabled</name> <value>false</value> <description>Atlas high availability feature toggle.</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>atlas.server.ids</name> @@ -35,8 +35,8 @@ <overridable>false</overridable> <visible>false</visible> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>atlas.server.address.id1</name> @@ -46,160 +46,160 @@ <overridable>false</overridable> <visible>false</visible> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>atlas.graph.storage.backend</name> <value>hbase</value> <description/> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>atlas.graph.storage.hostname</name> <value>{{hbase_zookeeper_quorum}}</value> <description/> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>atlas.audit.hbase.zookeeper.quorum</name> <value>{{hbase_zookeeper_quorum}}</value> <description/> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>atlas.graph.index.search.backend</name> <value>solr5</value> <description>The Atlas indexing backend (e.g. solr5).</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>atlas.graph.index.search.solr.mode</name> <value>cloud</value> <description>The Solr mode (e.g. cloud).</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>atlas.graph.index.search.solr.zookeeper-url</name> <value>{{solr_zookeeper_url}}</value> <description>The ZooKeeper quorum setup for Solr as comma separated value.</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>atlas.login.method</name> <value>file</value> <description>Atlas login method (e.g. file).</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>atlas.login.credentials.file</name> <value>{{atlas_login_credentials_file}}</value> <description>File path for file based login.</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>atlas.auth.policy.file</name> <value>{{atlas_policy_store_file}}</value> <description>Path for the Atlas policy file.</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>atlas.kafka.data</name> <value>{{metadata_home}}/data/kafka</value> <description>The Kafka data directory.</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>atlas.kafka.bootstrap.servers</name> <value>{{kafka_bootstrap_servers}}</value> <description>Comma separated list of Kafka broker endpoints in host:port form</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>atlas.kafka.zookeeper.connect</name> <value>{{kafka_zookeeper_connect}}</value> <description>Comma separated list of servers forming Zookeeper quorum used by Kafka.</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>atlas.kafka.hook.group.id</name> <value>atlas</value> <description>Kafka group id for the hook topic.</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>atlas.kafka.entities.group.id</name> <value>entities</value> <description>Kafka group id for the entity topic.</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>atlas.kafka.auto.commit.enable</name> <value>false</value> <description>Kafka auto commit setting for Atlas notifications.</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>atlas.lineage.schema.query.hive_table</name> <value>hive_table where __guid='%s'\, columns</value> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>atlas.lineage.schema.query.Table</name> <value>Table where __guid='%s'\, columns</value> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>atlas.lineage.hive.table.type.name</name> <deleted>true</deleted> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>atlas.lineage.hive.table.schema.query.hive_table</name> <deleted>true</deleted> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>atlas.lineage.hive.table.schema.query.Table</name> <deleted>true</deleted> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>atlas.lineage.hive.process.type.name</name> <deleted>true</deleted> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>atlas.lineage.hive.process.inputs.name</name> <deleted>true</deleted> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>atlas.lineage.hive.process.outputs.name</name> <deleted>true</deleted> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c95413/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/atlas-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/atlas-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/atlas-env.xml index 6015845..7d4b6ea 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/atlas-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/atlas-env.xml @@ -27,8 +27,8 @@ <value-attributes> <type>directory</type> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property require-input="false"> <name>metadata_pid_dir</name> @@ -37,8 +37,8 @@ <value-attributes> <type>directory</type> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>metadata_user</name> @@ -50,22 +50,22 @@ <type>user</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>metadata_opts</name> <value>-Xmx1024m -Dlog4j.configuration=atlas-log4j.xml</value> <description>Metadata Server command line options.</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>metadata_classpath</name> <value> </value> <description>Metadata Server additional classpath.</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property require-input="false"> <name>metadata_data_dir</name> @@ -74,15 +74,15 @@ <value-attributes> <type>directory</type> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property require-input="false"> <name>metadata_expanded_war_dir</name> <value>./server/webapp</value> <description>Atlas expanded WAR directory.</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>metadata_conf_file</name> @@ -93,22 +93,22 @@ <overridable>false</overridable> <visible>false</visible> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>atlas_solr_shards</name> <value>1</value> <description>The number of shards set for LogSearch SOLR.</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>atlas_solr_shards</name> <value>1</value> <description>The number of shards set for collections created in LogSearch SOLR.</description> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <!-- metadata-env.sh --> <property> @@ -150,7 +150,7 @@ <value-attributes> <type>content</type> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c95413/ambari-server/src/main/resources/stacks/HDP/2.5/services/FALCON/configuration/falcon-startup.properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/FALCON/configuration/falcon-startup.properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/FALCON/configuration/falcon-startup.properties.xml index 0f542cc..45d4a85 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/FALCON/configuration/falcon-startup.properties.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/FALCON/configuration/falcon-startup.properties.xml @@ -24,7 +24,7 @@ <name>*.shared.libs</name> <value>activemq-all,ant,geronimo-j2ee-management,jms,json-simple,oozie-client,spring-jms,commons-lang3,commons-el</value> <description/> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c95413/ambari-server/src/main/resources/stacks/HDP/2.5/services/HBASE/configuration/hbase-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HBASE/configuration/hbase-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HBASE/configuration/hbase-site.xml index 6a3084e..5c8814e 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HBASE/configuration/hbase-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HBASE/configuration/hbase-site.xml @@ -22,7 +22,7 @@ <property> <name>hbase.master.ui.readonly</name> <value>false</value> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c95413/ambari-server/src/main/resources/stacks/HDP/2.5/services/HBASE/configuration/ranger-hbase-audit.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HBASE/configuration/ranger-hbase-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HBASE/configuration/ranger-hbase-audit.xml index ddec304..42973d1 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HBASE/configuration/ranger-hbase-audit.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HBASE/configuration/ranger-hbase-audit.xml @@ -22,43 +22,43 @@ <property> <name>xasecure.audit.destination.db</name> <deleted>true</deleted> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>xasecure.audit.destination.db.jdbc.url</name> <deleted>true</deleted> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>xasecure.audit.destination.db.user</name> <deleted>true</deleted> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>xasecure.audit.destination.db.password</name> <deleted>true</deleted> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>xasecure.audit.destination.db.jdbc.driver</name> <deleted>true</deleted> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>xasecure.audit.credential.provider.file</name> <deleted>true</deleted> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>xasecure.audit.destination.db.batch.filespool.dir</name> <deleted>true</deleted> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c95413/ambari-server/src/main/resources/stacks/HDP/2.5/services/HDFS/configuration/ranger-hdfs-audit.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HDFS/configuration/ranger-hdfs-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HDFS/configuration/ranger-hdfs-audit.xml index 596cce4..e6d0d01 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HDFS/configuration/ranger-hdfs-audit.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HDFS/configuration/ranger-hdfs-audit.xml @@ -23,43 +23,43 @@ <property> <name>xasecure.audit.destination.db</name> <deleted>true</deleted> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>xasecure.audit.destination.db.jdbc.url</name> <deleted>true</deleted> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>xasecure.audit.destination.db.user</name> <deleted>true</deleted> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>xasecure.audit.destination.db.password</name> <deleted>true</deleted> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>xasecure.audit.destination.db.jdbc.driver</name> <deleted>true</deleted> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>xasecure.audit.credential.provider.file</name> <deleted>true</deleted> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>xasecure.audit.destination.db.batch.filespool.dir</name> <deleted>true</deleted> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c95413/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/beeline-log4j2.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/beeline-log4j2.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/beeline-log4j2.xml index 3d13ad6..8960886 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/beeline-log4j2.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/beeline-log4j2.xml @@ -75,7 +75,7 @@ rootLogger.appenderRef.root.ref = ${sys:hive.root.logger} <type>content</type> <show-property-name>false</show-property-name> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c95413/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-env.xml index 34439fb..f9d5a5f 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-env.xml @@ -79,7 +79,7 @@ <value-attributes> <type>content</type> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c95413/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-exec-log4j2.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-exec-log4j2.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-exec-log4j2.xml index 1914657..ab76a5a 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-exec-log4j2.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-exec-log4j2.xml @@ -96,7 +96,7 @@ rootLogger.appenderRef.root.ref = ${sys:hive.root.logger} <type>content</type> <show-property-name>false</show-property-name> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c95413/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml index 04d4533..88f1dc7 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml @@ -40,8 +40,8 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>hive_server_interactive_host</name> @@ -51,8 +51,8 @@ <value-attributes> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>llap_queue_capacity</name> @@ -79,8 +79,8 @@ <name>yarn.scheduler.capacity.root.queues</name> </property> </depends-on> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>num_llap_nodes</name> @@ -112,8 +112,8 @@ <name>hive.server2.tez.sessions.per.default.queue</name> </property> </depends-on> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>num_retries_for_checking_llap_status</name> @@ -126,8 +126,8 @@ <maximum>20</maximum> <increment-step>1</increment-step> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>llap_heap_size</name> @@ -159,8 +159,8 @@ <name>hive.server2.tez.sessions.per.default.queue</name> </property> </depends-on> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>slider_am_container_mb</name> @@ -193,32 +193,32 @@ <name>hive.server2.tez.sessions.per.default.queue</name> </property> </depends-on> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>llap_log_level</name> <value>INFO</value> <description>LLAP app logging level (WARN/INFO/DEBUG/TRACE)</description> <display-name>LLAP app logging level (WARN/INFO/DEBUG/TRACE)</display-name> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>llap_app_name</name> <value>llap0</value> <description>LLAP app name</description> <display-name>LLAP app name</display-name> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>llap_java_opts</name> <value>-XX:+UseG1GC -XX:TLABSize=8m -XX:+ResizeTLAB -XX:+UseNUMA -XX:+AggressiveOpts -XX:+AlwaysPreTouch -XX:MetaspaceSize=1024m -XX:InitiatingHeapOccupancyPercent=80 -XX:MaxGCPauseMillis=200</value> <description>Java opts for llap application</description> <display-name>LLAP app java opts</display-name> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> <!-- hive-env.sh --> <property> @@ -274,7 +274,7 @@ <value-attributes> <type>content</type> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" change="false" delete="false"/> + <on-stack-upgrade add="true" change="false" delete="false"/> </property> </configuration>
