http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/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 41ca04c..6ad6e62 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,7 +23,7 @@ <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="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.policymgr.clientssl.keystore.password</name> @@ -33,13 +33,13 @@ <value-attributes> <type>password</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </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="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.policymgr.clientssl.truststore.password</name> @@ -49,18 +49,18 @@ <value-attributes> <type>password</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <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" update="false" delete="false"/> + <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" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/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 70b36c3..6fe9f9e 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,36 +23,36 @@ <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="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </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="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </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="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </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="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </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="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </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="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/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 628ab6c..90ad1fc 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,7 +23,7 @@ <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="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <!-- yarn-env.sh --> <property> @@ -156,6 +156,6 @@ <value-attributes> <type>content</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/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 f337838..9ac34f3 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,6 +98,6 @@ log4j.appender.NMAUDIT.DatePattern=.yyyy-MM-dd <type>content</type> <show-property-name>false</show-property-name> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/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 185056e..0d9b5bb 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,12 +21,12 @@ <property> <name>yarn.node-labels.manager-class</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>yarn.timeline-service.recovery.enabled</name> <value>true</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>yarn.acl.enable</name> @@ -38,7 +38,7 @@ <name>ranger-yarn-plugin-enabled</name> </property> </depends-on> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>yarn.authorization-provider</name> @@ -49,7 +49,7 @@ <name>ranger-yarn-plugin-enabled</name> </property> </depends-on> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>yarn.admin.acl</name> @@ -58,32 +58,32 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </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="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </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="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </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="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </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="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>yarn.timeline-service.entity-group-fs-store.group-id-plugin-classes</name> @@ -92,31 +92,31 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </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="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </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="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </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="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </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="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/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 4e4d23d..6dd7b75 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,12 +22,12 @@ <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="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </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="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/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 0b45f48..97c3e6a 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,7 +24,7 @@ <name>atlas.server.ha.enabled</name> <value>false</value> <description>Atlas high availability feature toggle.</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>atlas.server.ids</name> @@ -34,7 +34,7 @@ <overridable>false</overridable> <visible>false</visible> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>atlas.server.address.id1</name> @@ -44,136 +44,136 @@ <overridable>false</overridable> <visible>false</visible> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>atlas.graph.storage.backend</name> <value>hbase</value> <description/> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>atlas.graph.storage.hostname</name> <value/> <description/> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>atlas.audit.hbase.zookeeper.quorum</name> <value/> <description/> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </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="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </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="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>atlas.graph.index.search.solr.zookeeper-url</name> <value/> <description>The ZooKeeper quorum setup for Solr as comma separated value.</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>atlas.login.method</name> <value>file</value> <description>Atlas login method (e.g. file).</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>atlas.login.credentials.file</name> <value>{{conf_dir}}/users-credentials.properties</value> <description>File path for file based login.</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>atlas.auth.policy.file</name> <value>{{conf_dir}}/policy-store.txt</value> <description>Path for the Atlas policy file.</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>atlas.kafka.data</name> <value>{{metadata_home}}/data/kafka</value> <description>The Kafka data directory.</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>atlas.kafka.bootstrap.servers</name> <value/> <description>Comma separated list of Kafka broker endpoints in host:port form</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>atlas.kafka.zookeeper.connect</name> <value/> <description>Comma separated list of servers forming Zookeeper quorum used by Kafka.</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </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="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </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="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </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="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>atlas.lineage.schema.query.hive_table</name> <value>hive_table where __guid='%s'\, columns</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>atlas.lineage.schema.query.Table</name> <value>Table where __guid='%s'\, columns</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>atlas.lineage.hive.table.type.name</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>atlas.lineage.hive.table.schema.query.hive_table</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>atlas.lineage.hive.table.schema.query.Table</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>atlas.lineage.hive.process.type.name</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>atlas.lineage.hive.process.inputs.name</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>atlas.lineage.hive.process.outputs.name</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/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 d59445d..dedabe4 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,7 +27,7 @@ <value-attributes> <type>directory</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property require-input="false"> <name>metadata_pid_dir</name> @@ -36,7 +36,7 @@ <value-attributes> <type>directory</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>metadata_user</name> @@ -48,19 +48,19 @@ <type>user</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </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="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>metadata_classpath</name> <value> </value> <description>Metadata Server additional classpath.</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property require-input="false"> <name>metadata_data_dir</name> @@ -69,13 +69,13 @@ <value-attributes> <type>directory</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </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="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>metadata_conf_file</name> @@ -86,19 +86,19 @@ <overridable>false</overridable> <visible>false</visible> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>atlas_solr_shards</name> <value>1</value> <description>The number of shards set for LogSearch SOLR.</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </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="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <!-- metadata-env.sh --> <property> @@ -140,6 +140,6 @@ <value-attributes> <type>content</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/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 71ea4ef..b0779bf 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="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>*.application.services</name> @@ -40,36 +40,36 @@ org.apache.falcon.metadata.MetadataMappingService </value> <description>Falcon application services</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>*.falcon.feed.lifecycle.policies</name> <value>org.apache.falcon.lifecycle.retention.AgeBasedDelete</value> <description>Feed lifecycle policy</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>*.lifecycle.engine.impl</name> <value>org.apache.falcon.lifecycle.engine.oozie.OoziePolicyBuilderFactory</value> <description>Feed lifecycle engine</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>*.extension.store.uri</name> <value>/apps/falcon/extensions</value> <description>Extension store uri</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>*.falcon.feed.lifecycle.policy.builders</name> <value>org.apache.falcon.lifecycle.engine.oozie.retention.AgeBasedDeleteBuilder</value> <description>Feed lifecycle policies</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>*.shared.libs</name> <value>activemq-all,ant,geronimo-j2ee-management,jms,json-simple,oozie-client,spring-jms,commons-lang3,commons-el</value> <description>Falcon shared libraries</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/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 d6db13d..49920c2 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,6 +22,6 @@ <property> <name>hbase.master.ui.readonly</name> <value>false</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/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 df5dd31..fcaecaa 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,36 +22,36 @@ <property> <name>xasecure.audit.destination.db</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.db.jdbc.url</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.db.user</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.db.password</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.db.jdbc.driver</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.credential.provider.file</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.db.batch.filespool.dir</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/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 4f71e2d..d0bb858 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,36 +23,36 @@ <property> <name>xasecure.audit.destination.db</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.db.jdbc.url</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.db.user</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.db.password</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.db.jdbc.driver</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.credential.provider.file</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.db.batch.filespool.dir</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/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 68fe67a..efe9d6e 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,6 +75,6 @@ rootLogger.appenderRef.root.ref = ${sys:hive.root.logger} <type>content</type> <show-property-name>false</show-property-name> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/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 f46744d..0c9aeaf 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,6 +79,6 @@ <value-attributes> <type>content</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/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 38042ed..03e8dae 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,6 +96,6 @@ rootLogger.appenderRef.root.ref = ${sys:hive.root.logger} <type>content</type> <show-property-name>false</show-property-name> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/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 37d76d0..c34351d 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,7 +40,7 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive_server_interactive_host</name> @@ -50,7 +50,7 @@ <value-attributes> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>llap_queue_capacity</name> @@ -77,7 +77,7 @@ <name>yarn.scheduler.capacity.root.queues</name> </property> </depends-on> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>num_llap_nodes</name> @@ -109,7 +109,7 @@ <name>hive.server2.tez.sessions.per.default.queue</name> </property> </depends-on> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>num_retries_for_checking_llap_status</name> @@ -122,7 +122,7 @@ <maximum>20</maximum> <increment-step>1</increment-step> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>llap_heap_size</name> @@ -154,7 +154,7 @@ <name>hive.server2.tez.sessions.per.default.queue</name> </property> </depends-on> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>slider_am_container_mb</name> @@ -187,28 +187,28 @@ <name>hive.server2.tez.sessions.per.default.queue</name> </property> </depends-on> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </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="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </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="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </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="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <!-- hive-env.sh --> <property> @@ -264,6 +264,6 @@ <value-attributes> <type>content</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml index 00052a9..3227478 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml @@ -28,13 +28,13 @@ limitations under the License. <overridable>false</overridable> <type>int</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.server2.thrift.http.port</name> <value>10501</value> <description>Port number of HiveServer2 Thrift interface when hive.server2.transport.mode is 'http'.</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.server2.tez.sessions.per.default.queue</name> @@ -67,7 +67,7 @@ limitations under the License. <name>yarn.scheduler.capacity.root.queues</name> </property> </depends-on> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.metastore.uris</name> @@ -76,7 +76,7 @@ limitations under the License. <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.server2.enable.doAs</name> @@ -106,7 +106,7 @@ limitations under the License. <name>hive_security_authorization</name> </property> </depends-on> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <!-- This is different for Hive batch and interactive --> @@ -128,7 +128,7 @@ limitations under the License. </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.tez.java.opts</name> @@ -137,7 +137,7 @@ limitations under the License. <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.vectorized.execution.reduce.enabled</name> @@ -161,7 +161,7 @@ limitations under the License. </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.server2.tez.default.queues</name> @@ -192,7 +192,7 @@ limitations under the License. <name>hive.llap.daemon.queue.name</name> </property> </depends-on> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.server2.tez.initialize.default.sessions</name> @@ -217,7 +217,7 @@ limitations under the License. </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.driver.parallel.compilation</name> @@ -240,25 +240,25 @@ limitations under the License. </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.server2.webui.port</name> <value>10502</value> <description>Web UI port address</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.server2.webui.use.ssl</name> <value>false</value> <description>Enable SSL for HiveServer2 Interactive</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.server2.zookeeper.namespace</name> <value>hiveserver2-hive2</value> <description>The parent node in ZooKeeper used by HiveServer2 when supporting dynamic service discovery.</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.llap.daemon.queue.name</name> @@ -285,22 +285,22 @@ limitations under the License. <name>enable_hive_interactive</name> </property> </depends-on> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.llap.daemon.yarn.shuffle.port</name> <value>15551</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.execution.mode</name> <value>llap</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.llap.execution.mode</name> <value>all</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.llap.io.enabled</name> @@ -311,52 +311,52 @@ limitations under the License. <name>hive.llap.io.memory.size</name> </property> </depends-on> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.llap.io.use.lrfu</name> <value>true</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.llap.auto.allow.uber</name> <value>false</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.llap.object.cache.enabled</name> <value>true</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.tez.input.generate.consistent.splits</name> <value>true</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.llap.client.consistent.splits</name> <value>true</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.llap.task.scheduler.locality.delay</name> <value>-1</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.exec.orc.split.strategy</name> <value>HYBRID</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.llap.daemon.service.hosts</name> <value>@llap0</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.llap.daemon.allow.permanent.fns</name> <value>false</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.llap.io.memory.size</name> @@ -390,7 +390,7 @@ limitations under the License. <name>hive.server2.tez.sessions.per.default.queue</name> </property> </depends-on> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.llap.daemon.num.executors</name> @@ -422,17 +422,17 @@ limitations under the License. <name>hive.server2.tez.sessions.per.default.queue</name> </property> </depends-on> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.llap.daemon.memory.per.instance.mb</name> <value>250</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.llap.daemon.vcpus.per.instance</name> <value>${hive.llap.daemon.num.executors}</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.llap.daemon.yarn.container.mb</name> @@ -466,77 +466,77 @@ limitations under the License. <name>hive.server2.tez.sessions.per.default.queue</name> </property> </depends-on> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>llap.shuffle.connection-keep-alive.enable</name> <value>true</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>llap.shuffle.connection-keep-alive.timeout</name> <value>60</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.llap.io.threadpool.size</name> <value>4</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.llap.daemon.rpc.port</name> <value>15001</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.llap.management.rpc.port</name> <value>15004</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.llap.daemon.task.scheduler.enable.preemption</name> <value>true</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.tez.exec.print.summary</name> <value>true</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.vectorized.execution.mapjoin.native.enabled</name> <value>true</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.vectorized.execution.mapjoin.minmax.enabled</name> <value>true</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.vectorized.execution.mapjoin.native.fast.hashtable.enabled</name> <value>true</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.mapjoin.hybridgrace.hashtable</name> <value>false</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.tez.bucket.pruning</name> <value>true</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.optimize.dynamic.partition.hashjoin</name> <value>true</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.llap.daemon.work.dirs</name> <value>${yarn.nodemanager.local-dirs}</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.llap.zk.sm.connectionString</name> @@ -547,11 +547,11 @@ limitations under the License. <name>clientPort</name> </property> </depends-on> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.llap.io.memory.mode</name> <value>none</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-log4j2.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-log4j2.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-log4j2.xml index 2b153ba..edec332 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-log4j2.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-log4j2.xml @@ -103,6 +103,6 @@ rootLogger.appenderRef.root.ref = ${sys:hive.root.logger} <type>content</type> <show-property-name>false</show-property-name> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/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 e4d69f2..c0a9e64 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 @@ -21,12 +21,12 @@ limitations under the License. <name>hive.metastore.schema.verification.record.version</name> <value>false</value> <description>Prevents metastore from overwriting the version number</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.metastore.schema.verification</name> <value>false</value> <description>Prevents metastore from complaining about version difference</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hivemetastore-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hivemetastore-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hivemetastore-site.xml index 569af7b..b73b1ae 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hivemetastore-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hivemetastore-site.xml @@ -23,21 +23,21 @@ limitations under the License. <value-attributes> <type>boolean</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.service.metrics.reporter</name> <value>JSON_FILE, JMX, HADOOP2</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.service.metrics.hadoop2.component</name> <value>hivemetastore</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.service.metrics.file.location</name> <value>/var/log/hive/hivemetastore-report.json</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hiveserver2-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hiveserver2-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hiveserver2-site.xml index 94d6a38..e120ac2 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hiveserver2-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hiveserver2-site.xml @@ -23,21 +23,21 @@ limitations under the License. <value-attributes> <type>boolean</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.service.metrics.reporter</name> <value>JSON_FILE, JMX, HADOOP2</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.service.metrics.hadoop2.component</name> <value>hiveserver2</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>hive.service.metrics.file.location</name> <value>/var/log/hive/hiveserver2-report.json</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/llap-cli-log4j2.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/llap-cli-log4j2.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/llap-cli-log4j2.xml index d73b0ca..a28aab3 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/llap-cli-log4j2.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/llap-cli-log4j2.xml @@ -104,6 +104,6 @@ rootLogger.appenderRef.root.ref = ${sys:hive.root.logger} <type>content</type> <show-property-name>false</show-property-name> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/llap-daemon-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/llap-daemon-log4j.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/llap-daemon-log4j.xml index 9f6c26b..0abee63 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/llap-daemon-log4j.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/llap-daemon-log4j.xml @@ -135,6 +135,6 @@ rootLogger.appenderRef.root.ref = ${sys:llap.daemon.root.logger} <type>content</type> <show-property-name>false</show-property-name> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/ranger-hive-audit.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/ranger-hive-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/ranger-hive-audit.xml index df5dd31..fcaecaa 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/ranger-hive-audit.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/ranger-hive-audit.xml @@ -22,36 +22,36 @@ <property> <name>xasecure.audit.destination.db</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.db.jdbc.url</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.db.user</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.db.password</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.db.jdbc.driver</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.credential.provider.file</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.db.batch.filespool.dir</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/tez-interactive-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/tez-interactive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/tez-interactive-site.xml index 33d0908..93a2073 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/tez-interactive-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/tez-interactive-site.xml @@ -22,7 +22,7 @@ <value>0.6</value> <description>Fraction (0-1) of the available memory which can be used to retain shuffled data</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>tez.runtime.shuffle.memory.limit.percent</name> @@ -30,31 +30,31 @@ <description>This property determines the maximum size of a shuffle segment which can be fetched to memory. Fraction (0-1) of shuffle memory (after applying tez.runtime.shuffle.fetch.buffer.percent)</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>tez.runtime.report.partition.stats</name> <value>true</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>tez.runtime.pipelined-shuffle.enabled</name> <value>false</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>tez.runtime.pipelined.sorter.lazy-allocate.memory</name> <value>true</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>tez.grouping.node.local.only</name> <value>true</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>tez.runtime.shuffle.fetch.verify-disk-checksum</name> <value>false</value> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/main/resources/stacks/HDP/2.5/services/KAFKA/configuration/ranger-kafka-audit.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/KAFKA/configuration/ranger-kafka-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/KAFKA/configuration/ranger-kafka-audit.xml index df5dd31..fcaecaa 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/KAFKA/configuration/ranger-kafka-audit.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/KAFKA/configuration/ranger-kafka-audit.xml @@ -22,36 +22,36 @@ <property> <name>xasecure.audit.destination.db</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.db.jdbc.url</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.db.user</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.db.password</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.db.jdbc.driver</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.credential.provider.file</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.db.batch.filespool.dir</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/main/resources/stacks/HDP/2.5/services/KNOX/configuration/knoxsso-topology.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/KNOX/configuration/knoxsso-topology.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/KNOX/configuration/knoxsso-topology.xml index b2e2e61..19634ea 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/KNOX/configuration/knoxsso-topology.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/KNOX/configuration/knoxsso-topology.xml @@ -121,6 +121,6 @@ <empty-value-valid>true</empty-value-valid> <show-property-name>false</show-property-name> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/main/resources/stacks/HDP/2.5/services/KNOX/configuration/ranger-knox-audit.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/KNOX/configuration/ranger-knox-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/KNOX/configuration/ranger-knox-audit.xml index df5dd31..fcaecaa 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/KNOX/configuration/ranger-knox-audit.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/KNOX/configuration/ranger-knox-audit.xml @@ -22,36 +22,36 @@ <property> <name>xasecure.audit.destination.db</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.db.jdbc.url</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.db.user</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.db.password</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.db.jdbc.driver</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.credential.provider.file</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.db.batch.filespool.dir</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER/configuration/ranger-tagsync-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER/configuration/ranger-tagsync-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER/configuration/ranger-tagsync-site.xml index eee836f..c3fe932 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER/configuration/ranger-tagsync-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER/configuration/ranger-tagsync-site.xml @@ -23,7 +23,7 @@ <name>ranger.tagsync.dest.ranger.ssl.config.filename</name> <value>/usr/hdp/current/ranger-tagsync/conf/mytruststore.jks</value> <description>Truststore used for tagsync, required if tagsync -> ranger admin communication is SSL enabled</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.tagsync.keystore.filename</name> @@ -32,6 +32,6 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER/configuration/ranger-ugsync-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER/configuration/ranger-ugsync-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER/configuration/ranger-ugsync-site.xml index eab9dab..4ff0a32 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER/configuration/ranger-ugsync-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER/configuration/ranger-ugsync-site.xml @@ -20,13 +20,13 @@ <name>ranger.usersync.keystore.file</name> <value>/usr/hdp/current/ranger-usersync/conf/unixauthservice.jks</value> <description>Keystore file used for usersync</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.truststore.file</name> <value>/usr/hdp/current/ranger-usersync/conf/mytruststore.jks</value> <description>Truststore used for usersync, required if usersync -> ranger admin communication is SSL enabled</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.ldap.bindkeystore</name> @@ -35,18 +35,18 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.credstore.filename</name> <value>/usr/hdp/current/ranger-usersync/conf/ugsync.jceks</value> <description>Credential store file name for user sync, specify full path</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.usersync.policymgr.keystore</name> <value>/usr/hdp/current/ranger-usersync/conf/ugsync.jceks</value> <description/> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER_KMS/configuration/dbks-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER_KMS/configuration/dbks-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER_KMS/configuration/dbks-site.xml index 59fd594..5350707 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER_KMS/configuration/dbks-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER_KMS/configuration/dbks-site.xml @@ -34,7 +34,7 @@ </entries> </value-attributes> <description>HSM type</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.ks.hsm.enabled</name> @@ -57,14 +57,14 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.ks.hsm.partition.name</name> <display-name>HSM partition name. In case of HSM HA enter the group name</display-name> <value>par19</value> <description/> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.ks.hsm.partition.password</name> @@ -74,14 +74,14 @@ <type>password</type> </value-attributes> <description>HSM partition password</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.ks.hsm.partition.password.alias</name> <display-name>HSM partition password alias</display-name> <value>ranger.kms.hsm.partition.password</value> <description>HSM partition password alias</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.ks.kerberos.principal</name> @@ -90,7 +90,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>ranger.ks.kerberos.keytab</name> @@ -99,6 +99,6 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER_KMS/configuration/kms-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER_KMS/configuration/kms-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER_KMS/configuration/kms-env.xml index f3cb3a0..ae45552 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER_KMS/configuration/kms-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER_KMS/configuration/kms-env.xml @@ -28,6 +28,6 @@ <type>password</type> </value-attributes> <description>HSM partition password</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER_KMS/configuration/ranger-kms-audit.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER_KMS/configuration/ranger-kms-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER_KMS/configuration/ranger-kms-audit.xml index cd2d72a..8348c3e 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER_KMS/configuration/ranger-kms-audit.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/RANGER_KMS/configuration/ranger-kms-audit.xml @@ -22,37 +22,37 @@ <property> <name>xasecure.audit.destination.db</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.db.jdbc.url</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.db.user</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.db.password</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.db.jdbc.driver</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.credential.provider.file</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.db.batch.filespool.dir</name> <deleted>true</deleted> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.solr.urls</name> @@ -67,7 +67,7 @@ <name>ranger.audit.solr.urls</name> </property> </depends-on> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.audit.destination.solr.zookeepers</name> @@ -79,6 +79,6 @@ <name>ranger.audit.solr.zookeepers</name> </property> </depends-on> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-conf.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-conf.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-conf.xml index 37ed586..7d3c78f 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-conf.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-conf.xml @@ -27,7 +27,7 @@ mode, Livy will enable debugging options, such as reporting possible routes on a 404. defaults to development </description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>livy.server.port</name> @@ -35,7 +35,7 @@ <description> What port to start the server on. Defaults to 8998. </description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>livy.server.session.timeout</name> @@ -44,7 +44,7 @@ Time in milliseconds on how long Livy will wait before timing out an idle session. Default is one hour. </description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>livy.impersonation.enabled</name> @@ -52,6 +52,6 @@ <description> If livy should use proxy users when submitting a job. </description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-env.xml index 668a8de..48e96ce 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-env.xml @@ -29,7 +29,7 @@ <type>user</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>livy_group</name> @@ -40,7 +40,7 @@ <value-attributes> <type>user</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>livy_log_dir</name> @@ -49,7 +49,7 @@ <value-attributes> <type>directory</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>livy_pid_dir</name> @@ -57,7 +57,7 @@ <value-attributes> <type>directory</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>spark_home</name> @@ -65,7 +65,7 @@ <value-attributes> <type>directory</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <!-- livy-env.sh --> <property> @@ -86,6 +86,6 @@ <value-attributes> <type>content</type> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-log4j-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-log4j-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-log4j-properties.xml index 0fbd11a..6a19c1a 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-log4j-properties.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-log4j-properties.xml @@ -36,6 +36,6 @@ <type>content</type> <show-property-name>false</show-property-name> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-spark-blacklist.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-spark-blacklist.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-spark-blacklist.xml index 2f5676e..01a00ac 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-spark-blacklist.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/configuration/livy-spark-blacklist.xml @@ -35,6 +35,6 @@ <type>content</type> <show-property-name>false</show-property-name> </value-attributes> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/1d31dcfc/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/ranger-storm-policymgr-ssl.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/ranger-storm-policymgr-ssl.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/ranger-storm-policymgr-ssl.xml index 500d086..21658e7 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/ranger-storm-policymgr-ssl.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/STORM/configuration/ranger-storm-policymgr-ssl.xml @@ -23,12 +23,12 @@ <name>xasecure.policymgr.clientssl.keystore</name> <value>/usr/hdp/current/storm-client/conf/ranger-plugin-keystore.jks</value> <description>Java Keystore files</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> <property> <name>xasecure.policymgr.clientssl.truststore</name> <value>/usr/hdp/current/storm-client/conf/ranger-plugin-truststore.jks</value> <description>java truststore file</description> - <on-ambari-upgrade add="true" update="false" delete="false"/> + <on-ambari-upgrade add="true"/> </property> </configuration>
