Revert "AMBARI-16272. Ambari Upgrade shouldn't automatically add stack configs. Fix default upgrade policy and script defaults (dlysnichenko)" - faling tests
This reverts commit 8e7103a863b8649d7373537eb3bfbdffdfb18bf2. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b7c95413 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b7c95413 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b7c95413 Branch: refs/heads/branch-2.4 Commit: b7c95413b19037b99e3d7ddf9f58f1c902ad914e Parents: c498bdb Author: Srimanth Gunturi <[email protected]> Authored: Wed Jun 1 22:36:21 2016 -0700 Committer: Srimanth Gunturi <[email protected]> Committed: Wed Jun 1 22:36:21 2016 -0700 ---------------------------------------------------------------------- .../1.6.1.2.2.0/configuration/accumulo-env.xml | 68 +- .../configuration/accumulo-log4j.xml | 28 +- .../1.6.1.2.2.0/configuration/accumulo-site.xml | 68 +- .../0.1.0/configuration/ams-env.xml | 28 +- .../0.1.0/configuration/ams-grafana-env.xml | 24 +- .../0.1.0/configuration/ams-grafana-ini.xml | 20 +- .../0.1.0/configuration/ams-hbase-env.xml | 44 +- .../0.1.0/configuration/ams-hbase-log4j.xml | 4 +- .../0.1.0/configuration/ams-hbase-policy.xml | 12 +- .../configuration/ams-hbase-security-site.xml | 68 +- .../0.1.0/configuration/ams-hbase-site.xml | 200 +++--- .../0.1.0/configuration/ams-log4j.xml | 4 +- .../0.1.0/configuration/ams-site.xml | 242 +++---- .../0.1.0/configuration/ams-ssl-client.xml | 12 +- .../0.1.0/configuration/ams-ssl-server.xml | 32 +- .../0.1.0/configuration/storm-site.xml | 4 +- .../configuration/application-properties.xml | 140 ++--- .../ATLAS/0.1.0.2.3/configuration/atlas-env.xml | 36 +- .../0.1.0.2.3/configuration/atlas-log4j.xml | 12 +- .../0.5.0.2.1/configuration/falcon-env.xml | 48 +- .../configuration/falcon-runtime.properties.xml | 20 +- .../configuration/falcon-startup.properties.xml | 124 ++-- .../0.5.0.2.1/configuration/oozie-site.xml | 32 +- .../1.4.0.2.0/configuration/flume-conf.xml | 4 +- .../FLUME/1.4.0.2.0/configuration/flume-env.xml | 20 +- .../GANGLIA/3.5.0/configuration/ganglia-env.xml | 40 +- .../HAWQ/2.0.0/configuration/hawq-check-env.xml | 4 +- .../HAWQ/2.0.0/configuration/hawq-env.xml | 8 +- .../2.0.0/configuration/hawq-limits-env.xml | 16 +- .../HAWQ/2.0.0/configuration/hawq-site.xml | 76 +-- .../2.0.0/configuration/hawq-sysctl-env.xml | 96 +-- .../HAWQ/2.0.0/configuration/hdfs-client.xml | 128 ++-- .../HAWQ/2.0.0/configuration/yarn-client.xml | 40 +- .../0.96.0.2.0/configuration/hbase-env.xml | 52 +- .../0.96.0.2.0/configuration/hbase-log4j.xml | 4 +- .../0.96.0.2.0/configuration/hbase-policy.xml | 12 +- .../0.96.0.2.0/configuration/hbase-site.xml | 152 ++--- .../HDFS/2.1.0.2.0/configuration/core-site.xml | 60 +- .../HDFS/2.1.0.2.0/configuration/hadoop-env.xml | 72 +-- .../2.1.0.2.0/configuration/hadoop-policy.xml | 44 +- .../HDFS/2.1.0.2.0/configuration/hdfs-log4j.xml | 4 +- .../HDFS/2.1.0.2.0/configuration/hdfs-site.xml | 192 +++--- .../HDFS/2.1.0.2.0/configuration/ssl-client.xml | 28 +- .../HDFS/2.1.0.2.0/configuration/ssl-server.xml | 32 +- .../HIVE/0.12.0.2.0/configuration/hcat-env.xml | 4 +- .../HIVE/0.12.0.2.0/configuration/hive-env.xml | 64 +- .../configuration/hive-exec-log4j.xml | 4 +- .../0.12.0.2.0/configuration/hive-log4j.xml | 4 +- .../HIVE/0.12.0.2.0/configuration/hive-site.xml | 196 +++--- .../0.12.0.2.0/configuration/webhcat-env.xml | 4 +- .../0.12.0.2.0/configuration/webhcat-log4j.xml | 4 +- .../0.12.0.2.0/configuration/webhcat-site.xml | 76 +-- .../KAFKA/0.8.1/configuration/kafka-broker.xml | 212 +++---- .../KAFKA/0.8.1/configuration/kafka-env.xml | 36 +- .../KAFKA/0.8.1/configuration/kafka-log4j.xml | 4 +- .../KAFKA/0.9.0/configuration/kafka-broker.xml | 92 +-- .../KAFKA/0.9.0/configuration/kafka-env.xml | 4 +- .../0.9.0/configuration/ranger-kafka-audit.xml | 64 +- .../ranger-kafka-plugin-properties.xml | 28 +- .../ranger-kafka-policymgr-ssl.xml | 24 +- .../configuration/ranger-kafka-security.xml | 24 +- .../1.10.3-10/configuration/kerberos-env.xml | 100 +-- .../1.10.3-10/configuration/krb5-conf.xml | 16 +- .../0.5.0.2.2/configuration/admin-topology.xml | 4 +- .../0.5.0.2.2/configuration/gateway-log4j.xml | 4 +- .../0.5.0.2.2/configuration/gateway-site.xml | 28 +- .../KNOX/0.5.0.2.2/configuration/knox-env.xml | 24 +- .../KNOX/0.5.0.2.2/configuration/ldap-log4j.xml | 4 +- .../ranger-knox-plugin-properties.xml | 124 ++-- .../KNOX/0.5.0.2.2/configuration/topology.xml | 4 +- .../KNOX/0.5.0.2.2/configuration/users-ldif.xml | 4 +- .../0.5.0/configuration/logfeeder-env.xml | 56 +- .../0.5.0/configuration/logfeeder-log4j.xml | 4 +- .../configuration/logfeeder-properties.xml | 20 +- .../configuration/logsearch-admin-json.xml | 12 +- .../logsearch-audit_logs-solrconfig.xml | 12 +- .../0.5.0/configuration/logsearch-env.xml | 72 +-- .../0.5.0/configuration/logsearch-log4j.xml | 4 +- .../configuration/logsearch-properties.xml | 44 +- .../logsearch-service_logs-solrconfig.xml | 12 +- .../logsearch-solr-client-log4j.xml | 4 +- .../0.5.0/configuration/logsearch-solr-env.xml | 76 +-- .../configuration/logsearch-solr-log4j.xml | 4 +- .../0.5.0/configuration/logsearch-solr-xml.xml | 4 +- .../1.0.0.2.3/configuration/mahout-env.xml | 4 +- .../1.0.0.2.3/configuration/mahout-log4j.xml | 4 +- .../OOZIE/4.0.0.2.0/configuration/oozie-env.xml | 52 +- .../4.0.0.2.0/configuration/oozie-log4j.xml | 4 +- .../4.0.0.2.0/configuration/oozie-site.xml | 120 ++-- .../OOZIE/4.2.0.2.3/configuration/oozie-env.xml | 4 +- .../4.2.0.2.3/configuration/oozie-log4j.xml | 4 +- .../4.2.0.2.3/configuration/oozie-site.xml | 60 +- .../PIG/0.12.0.2.0/configuration/pig-env.xml | 4 +- .../PIG/0.12.0.2.0/configuration/pig-log4j.xml | 4 +- .../0.12.0.2.0/configuration/pig-properties.xml | 4 +- .../PXF/3.0.0/configuration/pxf-profiles.xml | 4 +- .../configuration/pxf-public-classpath.xml | 4 +- .../PXF/3.0.0/configuration/pxf-site.xml | 4 +- .../0.4.0/configuration/admin-properties.xml | 100 +-- .../RANGER/0.4.0/configuration/ranger-env.xml | 80 +-- .../RANGER/0.4.0/configuration/ranger-site.xml | 28 +- .../0.4.0/configuration/usersync-properties.xml | 68 +- .../0.5.0/configuration/admin-properties.xml | 60 +- .../0.5.0/configuration/ranger-admin-site.xml | 220 +++---- .../RANGER/0.5.0/configuration/ranger-env.xml | 44 +- .../RANGER/0.5.0/configuration/ranger-site.xml | 28 +- .../0.5.0/configuration/ranger-ugsync-site.xml | 184 +++--- .../0.5.0/configuration/usersync-properties.xml | 68 +- .../RANGER/0.6.0/configuration/admin-log4j.xml | 4 +- .../0.6.0/configuration/admin-properties.xml | 12 +- .../0.6.0/configuration/ranger-admin-site.xml | 72 +-- .../RANGER/0.6.0/configuration/ranger-env.xml | 16 +- .../0.6.0/configuration/ranger-tagsync-site.xml | 64 +- .../0.6.0/configuration/ranger-ugsync-site.xml | 28 +- .../tagsync-application-properties.xml | 12 +- .../0.6.0/configuration/tagsync-log4j.xml | 4 +- .../0.6.0/configuration/usersync-log4j.xml | 4 +- .../0.5.0.2.3/configuration/dbks-site.xml | 44 +- .../0.5.0.2.3/configuration/kms-env.xml | 20 +- .../0.5.0.2.3/configuration/kms-log4j.xml | 4 +- .../0.5.0.2.3/configuration/kms-properties.xml | 44 +- .../0.5.0.2.3/configuration/kms-site.xml | 68 +- .../configuration/ranger-kms-audit.xml | 64 +- .../configuration/ranger-kms-policymgr-ssl.xml | 24 +- .../configuration/ranger-kms-security.xml | 24 +- .../0.5.0.2.3/configuration/ranger-kms-site.xml | 28 +- .../0.60.0.2.2/configuration/slider-env.xml | 4 +- .../0.60.0.2.2/configuration/slider-log4j.xml | 4 +- .../1.2.1/configuration/spark-defaults.xml | 66 +- .../SPARK/1.2.1/configuration/spark-env.xml | 28 +- .../configuration/spark-log4j-properties.xml | 4 +- .../configuration/spark-metrics-properties.xml | 4 +- .../configuration/spark-hive-site-override.xml | 20 +- .../configuration/spark-thrift-sparkconf.xml | 40 +- .../1.6.0/configuration/spark-defaults.xml | 20 +- .../spark-thrift-fairscheduler.xml | 4 +- .../configuration/spark-thrift-sparkconf.xml | 96 +-- .../2.0.0/configuration/spark2-defaults.xml | 40 +- .../SPARK2/2.0.0/configuration/spark2-env.xml | 24 +- .../configuration/spark2-hive-site-override.xml | 20 +- .../configuration/spark2-log4j-properties.xml | 4 +- .../configuration/spark2-metrics-properties.xml | 4 +- .../spark2-thrift-fairscheduler.xml | 4 +- .../configuration/spark2-thrift-sparkconf.xml | 60 +- .../SQOOP/1.4.4.2.0/configuration/sqoop-env.xml | 12 +- .../1.4.4.2.0/configuration/sqoop-site.xml | 8 +- .../0.10.0/configuration/ranger-storm-audit.xml | 64 +- .../ranger-storm-plugin-properties.xml | 100 +-- .../ranger-storm-policymgr-ssl.xml | 24 +- .../configuration/ranger-storm-security.xml | 24 +- .../configuration/storm-cluster-log4j.xml | 4 +- .../STORM/0.10.0/configuration/storm-env.xml | 12 +- .../STORM/0.10.0/configuration/storm-site.xml | 24 +- .../0.10.0/configuration/storm-worker-log4j.xml | 4 +- .../STORM/0.9.1/configuration/storm-env.xml | 64 +- .../STORM/0.9.1/configuration/storm-site.xml | 384 ++++++------ .../ranger-storm-plugin-properties.xml | 120 ++-- .../STORM/0.9.3/configuration/storm-env.xml | 4 +- .../STORM/0.9.3/configuration/storm-site.xml | 56 +- .../1.0.1/configuration/ranger-storm-audit.xml | 28 +- .../STORM/1.0.1/configuration/storm-site.xml | 36 +- .../TEZ/0.4.0.2.1/configuration/tez-env.xml | 8 +- .../TEZ/0.4.0.2.1/configuration/tez-site.xml | 100 +-- .../configuration-mapred/mapred-env.xml | 28 +- .../configuration-mapred/mapred-site.xml | 152 ++--- .../configuration/capacity-scheduler.xml | 52 +- .../YARN/2.1.0.2.0/configuration/yarn-env.xml | 44 +- .../YARN/2.1.0.2.0/configuration/yarn-log4j.xml | 4 +- .../YARN/2.1.0.2.0/configuration/yarn-site.xml | 156 ++--- .../0.6.0.2.5/configuration/zeppelin-config.xml | 92 +-- .../0.6.0.2.5/configuration/zeppelin-env.xml | 40 +- .../ZOOKEEPER/3.4.5/configuration/zoo.cfg.xml | 28 +- .../3.4.5/configuration/zookeeper-env.xml | 28 +- .../3.4.5/configuration/zookeeper-log4j.xml | 4 +- .../configurations-set-default-update-policy.sh | 12 +- .../BIGTOP/0.8/configuration/cluster-env.xml | 24 +- .../services/FLUME/configuration/flume-conf.xml | 4 +- .../services/FLUME/configuration/flume-env.xml | 16 +- .../FLUME/configuration/flume-log4j.xml | 4 +- .../GANGLIA/configuration/ganglia-env.xml | 40 +- .../services/HBASE/configuration/hbase-env.xml | 32 +- .../HBASE/configuration/hbase-log4j.xml | 4 +- .../HBASE/configuration/hbase-policy.xml | 12 +- .../services/HBASE/configuration/hbase-site.xml | 136 ++-- .../services/HDFS/configuration/core-site.xml | 52 +- .../services/HDFS/configuration/hadoop-env.xml | 52 +- .../HDFS/configuration/hadoop-policy.xml | 44 +- .../services/HDFS/configuration/hdfs-log4j.xml | 4 +- .../services/HDFS/configuration/hdfs-site.xml | 188 +++--- .../services/HIVE/configuration/hcat-env.xml | 4 +- .../services/HIVE/configuration/hive-env.xml | 52 +- .../HIVE/configuration/hive-exec-log4j.xml | 4 +- .../services/HIVE/configuration/hive-log4j.xml | 4 +- .../services/HIVE/configuration/hive-site.xml | 288 ++++----- .../services/HIVE/configuration/webhcat-env.xml | 4 +- .../HIVE/configuration/webhcat-site.xml | 72 +-- .../services/OOZIE/configuration/oozie-env.xml | 32 +- .../OOZIE/configuration/oozie-log4j.xml | 4 +- .../services/OOZIE/configuration/oozie-site.xml | 116 ++-- .../0.8/services/PIG/configuration/pig-env.xml | 4 +- .../services/PIG/configuration/pig-log4j.xml | 4 +- .../PIG/configuration/pig-properties.xml | 4 +- .../YARN/configuration-mapred/mapred-env.xml | 20 +- .../YARN/configuration-mapred/mapred-site.xml | 148 ++--- .../YARN/configuration/capacity-scheduler.xml | 52 +- .../services/YARN/configuration/yarn-env.xml | 36 +- .../services/YARN/configuration/yarn-log4j.xml | 4 +- .../services/YARN/configuration/yarn-site.xml | 188 +++--- .../ZOOKEEPER/configuration/zookeeper-env.xml | 36 +- .../ZOOKEEPER/configuration/zookeeper-log4j.xml | 4 +- .../GLUSTERFS/configuration/core-site.xml | 20 +- .../GLUSTERFS/configuration/hadoop-env.xml | 40 +- .../services/HBASE/configuration/hbase-site.xml | 152 ++--- .../services/HDFS/configuration/core-site.xml | 48 +- .../services/HDFS/configuration/global.xml | 136 ++-- .../HDFS/configuration/hadoop-policy.xml | 44 +- .../services/HDFS/configuration/hdfs-site.xml | 232 +++---- .../services/HIVE/configuration/hive-site.xml | 284 ++++----- .../services/OOZIE/configuration/oozie-site.xml | 116 ++-- .../PIG/configuration/pig-properties.xml | 4 +- .../YARN/configuration-mapred/mapred-site.xml | 44 +- .../YARN/configuration/capacity-scheduler.xml | 52 +- .../services/YARN/configuration/yarn-env.xml | 36 +- .../services/YARN/configuration/yarn-site.xml | 188 +++--- .../HDP/2.0.6/configuration/cluster-env.xml | 96 +-- .../services/OOZIE/configuration/oozie-env.xml | 4 +- .../FALCON/configuration/falcon-env.xml | 32 +- .../configuration/falcon-runtime.properties.xml | 20 +- .../configuration/falcon-startup.properties.xml | 136 ++-- .../FALCON/configuration/oozie-site.xml | 28 +- .../GLUSTERFS/configuration/core-site.xml | 12 +- .../GLUSTERFS/configuration/hadoop-env.xml | 40 +- .../services/HBASE/configuration/hbase-site.xml | 152 ++--- .../services/HIVE/configuration/hive-site.xml | 284 ++++----- .../services/OOZIE/configuration/oozie-site.xml | 116 ++-- .../PIG/configuration/pig-properties.xml | 4 +- .../services/STORM/configuration/storm-env.xml | 12 +- .../services/STORM/configuration/storm-site.xml | 376 +++++------ .../services/TEZ/configuration/tez-env.xml | 4 +- .../services/TEZ/configuration/tez-site.xml | 100 +-- .../YARN/configuration-mapred/mapred-site.xml | 44 +- .../YARN/configuration-mapred/ssl-client.xml | 28 +- .../YARN/configuration-mapred/ssl-server.xml | 32 +- .../YARN/configuration/capacity-scheduler.xml | 52 +- .../services/YARN/configuration/yarn-env.xml | 36 +- .../services/YARN/configuration/yarn-site.xml | 188 +++--- .../FALCON/configuration/oozie-site.xml | 32 +- .../services/HDFS/configuration/hdfs-site.xml | 8 +- .../services/HIVE/configuration/hive-site.xml | 300 ++++----- .../services/OOZIE/configuration/oozie-site.xml | 112 ++-- .../PIG/configuration/pig-properties.xml | 4 +- .../services/YARN/configuration/yarn-env.xml | 8 +- .../services/YARN/configuration/yarn-site.xml | 40 +- .../configuration/falcon-startup.properties.xml | 60 +- .../FALCON/configuration/oozie-site.xml | 32 +- .../services/HBASE/configuration/hbase-env.xml | 32 +- .../services/HBASE/configuration/hbase-site.xml | 72 +-- .../ranger-hbase-plugin-properties.xml | 124 ++-- .../services/HDFS/configuration/core-site.xml | 8 +- .../services/HDFS/configuration/hadoop-env.xml | 12 +- .../services/HDFS/configuration/hdfs-log4j.xml | 4 +- .../services/HDFS/configuration/hdfs-site.xml | 20 +- .../ranger-hdfs-plugin-properties.xml | 124 ++-- .../services/HIVE/configuration/hive-env.xml | 24 +- .../services/HIVE/configuration/hive-site.xml | 620 +++++++++--------- .../HIVE/configuration/hiveserver2-site.xml | 16 +- .../ranger-hive-plugin-properties.xml | 124 ++-- .../HIVE/configuration/webhcat-site.xml | 60 +- .../ranger-knox-plugin-properties.xml | 4 +- .../services/OOZIE/configuration/oozie-env.xml | 4 +- .../services/OOZIE/configuration/oozie-site.xml | 24 +- .../services/STORM/configuration/storm-site.xml | 16 +- .../2.2/services/TEZ/configuration/tez-site.xml | 172 ++--- .../YARN/configuration-mapred/mapred-env.xml | 4 +- .../YARN/configuration-mapred/mapred-site.xml | 44 +- .../YARN/configuration/capacity-scheduler.xml | 12 +- .../services/YARN/configuration/yarn-env.xml | 4 +- .../services/YARN/configuration/yarn-site.xml | 248 ++++---- .../services/ECS/configuration/core-site.xml | 64 +- .../services/ECS/configuration/hadoop-env.xml | 20 +- .../services/ECS/configuration/hdfs-site.xml | 8 +- .../services/HBASE/configuration/hbase-env.xml | 4 +- .../services/HBASE/configuration/hbase-site.xml | 4 +- .../services/TEZ/configuration/tez-site.xml | 4 +- .../YARN/configuration-mapred/mapred-site.xml | 4 +- .../services/YARN/configuration/yarn-site.xml | 4 +- .../ACCUMULO/configuration/accumulo-log4j.xml | 28 +- .../GLUSTERFS/configuration/core-site.xml | 68 +- .../GLUSTERFS/configuration/hadoop-env.xml | 40 +- .../services/HBASE/configuration/hbase-site.xml | 156 ++--- .../services/HIVE/configuration/hive-site.xml | 212 +++---- .../HIVE/configuration/webhcat-site.xml | 72 +-- .../services/OOZIE/configuration/oozie-site.xml | 124 ++-- .../services/TEZ/configuration/tez-site.xml | 24 +- .../YARN/configuration-mapred/mapred-site.xml | 44 +- .../YARN/configuration/capacity-scheduler.xml | 12 +- .../services/YARN/configuration/yarn-site.xml | 216 +++---- .../ACCUMULO/configuration/accumulo-env.xml | 4 +- .../ACCUMULO/configuration/accumulo-log4j.xml | 28 +- .../ACCUMULO/configuration/accumulo-site.xml | 4 +- .../FALCON/configuration/falcon-env.xml | 4 +- .../configuration/falcon-startup.properties.xml | 4 +- .../services/HBASE/configuration/hbase-env.xml | 4 +- .../services/HBASE/configuration/hbase-site.xml | 24 +- .../HBASE/configuration/ranger-hbase-audit.xml | 64 +- .../ranger-hbase-plugin-properties.xml | 104 ++-- .../ranger-hbase-policymgr-ssl.xml | 24 +- .../configuration/ranger-hbase-security.xml | 28 +- .../services/HDFS/configuration/hadoop-env.xml | 8 +- .../services/HDFS/configuration/hdfs-site.xml | 16 +- .../HDFS/configuration/ranger-hdfs-audit.xml | 64 +- .../ranger-hdfs-plugin-properties.xml | 100 +-- .../configuration/ranger-hdfs-policymgr-ssl.xml | 24 +- .../HDFS/configuration/ranger-hdfs-security.xml | 28 +- .../services/HIVE/configuration/hive-env.xml | 4 +- .../services/HIVE/configuration/hive-site.xml | 16 +- .../HIVE/configuration/ranger-hive-audit.xml | 64 +- .../ranger-hive-plugin-properties.xml | 104 ++-- .../configuration/ranger-hive-policymgr-ssl.xml | 24 +- .../HIVE/configuration/ranger-hive-security.xml | 28 +- .../HIVE/configuration/webhcat-site.xml | 8 +- .../ranger-kafka-policymgr-ssl.xml | 8 +- .../KNOX/configuration/knoxsso-topology.xml | 4 +- .../KNOX/configuration/ranger-knox-audit.xml | 64 +- .../ranger-knox-plugin-properties.xml | 100 +-- .../configuration/ranger-knox-policymgr-ssl.xml | 24 +- .../KNOX/configuration/ranger-knox-security.xml | 24 +- .../services/OOZIE/configuration/oozie-env.xml | 4 +- .../PIG/configuration/pig-properties.xml | 4 +- .../RANGER/configuration/ranger-ugsync-site.xml | 16 +- .../configuration/ranger-kms-policymgr-ssl.xml | 8 +- .../ranger-storm-policymgr-ssl.xml | 8 +- .../configuration/ranger-storm-security.xml | 4 +- .../services/STORM/configuration/storm-site.xml | 16 +- .../2.3/services/TEZ/configuration/tez-site.xml | 36 +- .../YARN/configuration-mapred/mapred-site.xml | 12 +- .../YARN/configuration/capacity-scheduler.xml | 4 +- .../YARN/configuration/ranger-yarn-audit.xml | 64 +- .../ranger-yarn-plugin-properties.xml | 24 +- .../configuration/ranger-yarn-policymgr-ssl.xml | 24 +- .../YARN/configuration/ranger-yarn-security.xml | 24 +- .../services/YARN/configuration/yarn-env.xml | 8 +- .../services/YARN/configuration/yarn-log4j.xml | 4 +- .../services/YARN/configuration/yarn-site.xml | 56 +- .../services/YARN/configuration/yarn-site.xml | 8 +- .../configuration/application-properties.xml | 104 ++-- .../services/ATLAS/configuration/atlas-env.xml | 44 +- .../configuration/falcon-startup.properties.xml | 4 +- .../services/HBASE/configuration/hbase-site.xml | 4 +- .../HBASE/configuration/ranger-hbase-audit.xml | 28 +- .../HDFS/configuration/ranger-hdfs-audit.xml | 28 +- .../HIVE/configuration/beeline-log4j2.xml | 4 +- .../services/HIVE/configuration/hive-env.xml | 4 +- .../HIVE/configuration/hive-exec-log4j2.xml | 4 +- .../HIVE/configuration/hive-interactive-env.xml | 44 +- .../configuration/hive-interactive-site.xml | 192 +++--- .../services/HIVE/configuration/hive-log4j2.xml | 4 +- .../services/HIVE/configuration/hive-site.xml | 8 +- .../HIVE/configuration/hivemetastore-site.xml | 16 +- .../HIVE/configuration/hiveserver2-site.xml | 16 +- .../HIVE/configuration/llap-cli-log4j2.xml | 4 +- .../HIVE/configuration/llap-daemon-log4j.xml | 4 +- .../HIVE/configuration/ranger-hive-audit.xml | 28 +- .../HIVE/configuration/tez-interactive-site.xml | 280 ++++----- .../KAFKA/configuration/ranger-kafka-audit.xml | 28 +- .../KNOX/configuration/knoxsso-topology.xml | 4 +- .../KNOX/configuration/ranger-knox-audit.xml | 28 +- .../configuration/ranger-tagsync-site.xml | 8 +- .../RANGER/configuration/ranger-ugsync-site.xml | 20 +- .../RANGER_KMS/configuration/dbks-site.xml | 28 +- .../RANGER_KMS/configuration/kms-env.xml | 4 +- .../configuration/ranger-kms-audit.xml | 36 +- .../ranger-storm-policymgr-ssl.xml | 8 +- .../configuration/ranger-storm-security.xml | 4 +- .../services/STORM/configuration/storm-site.xml | 16 +- .../YARN/configuration/capacity-scheduler.xml | 4 +- .../YARN/configuration/ranger-yarn-audit.xml | 28 +- .../services/YARN/configuration/yarn-site.xml | 16 +- .../ZEPPELIN/configuration/zeppelin-env.xml | 4 +- .../HDPWIN/2.1/configuration/cluster-env.xml | 32 +- .../AMBARI_METRICS/configuration/ams-env.xml | 24 +- .../configuration/ams-hbase-env.xml | 16 +- .../configuration/ams-hbase-site.xml | 8 +- .../AMBARI_METRICS/configuration/ams-log4j.xml | 4 +- .../AMBARI_METRICS/configuration/ams-site.xml | 4 +- .../FALCON/configuration/falcon-env.xml | 24 +- .../services/FLUME/configuration/flume-conf.xml | 4 +- .../services/FLUME/configuration/flume-env.xml | 4 +- .../services/HBASE/configuration/hbase-env.xml | 16 +- .../services/HBASE/configuration/hbase-site.xml | 8 +- .../services/HDFS/configuration/core-site.xml | 4 +- .../services/HDFS/configuration/hadoop-env.xml | 20 +- .../services/HDFS/configuration/hdfs-site.xml | 36 +- .../services/HIVE/configuration/hcat-env.xml | 4 +- .../services/HIVE/configuration/hive-env.xml | 44 +- .../services/HIVE/configuration/hive-site.xml | 164 ++--- .../services/HIVE/configuration/webhcat-env.xml | 4 +- .../HIVE/configuration/webhcat-site.xml | 30 +- .../services/OOZIE/configuration/oozie-env.xml | 24 +- .../services/OOZIE/configuration/oozie-site.xml | 20 +- .../services/SQOOP/configuration/sqoop-env.xml | 8 +- .../services/STORM/configuration/storm-env.xml | 16 +- .../services/STORM/configuration/storm-site.xml | 8 +- .../2.1/services/TEZ/configuration/tez-env.xml | 8 +- .../2.1/services/TEZ/configuration/tez-site.xml | 4 +- .../YARN/configuration-mapred/mapred-env.xml | 16 +- .../YARN/configuration-mapred/mapred-site.xml | 12 +- .../services/YARN/configuration/yarn-env.xml | 16 +- .../services/YARN/configuration/yarn-site.xml | 48 +- .../ZOOKEEPER/configuration/zoo.cfg.xml | 4 +- .../ZOOKEEPER/configuration/zookeeper-env.xml | 16 +- .../configuration/falcon-startup.properties.xml | 60 +- .../services/HBASE/configuration/hbase-env.xml | 4 +- .../services/HBASE/configuration/hbase-site.xml | 40 +- .../services/HDFS/configuration/core-site.xml | 4 +- .../services/HDFS/configuration/hadoop-env.xml | 4 +- .../services/HDFS/configuration/hdfs-log4j.xml | 4 +- .../services/HDFS/configuration/hdfs-site.xml | 4 +- .../services/HIVE/configuration/hive-env.xml | 24 +- .../services/HIVE/configuration/hive-site.xml | 624 +++++++++---------- .../HIVE/configuration/hiveserver2-site.xml | 12 +- .../HIVE/configuration/webhcat-site.xml | 48 +- .../KNOX/configuration/gateway-site.xml | 8 +- .../services/KNOX/configuration/knox-env.xml | 12 +- .../ranger-knox-plugin-properties.xml | 4 +- .../services/OOZIE/configuration/oozie-site.xml | 24 +- .../SLIDER/configurations/slider-client.xml | 4 +- .../services/STORM/configuration/storm-site.xml | 40 +- .../2.2/services/TEZ/configuration/tez-site.xml | 152 ++--- .../YARN/configuration-mapred/mapred-site.xml | 44 +- .../YARN/configuration/capacity-scheduler.xml | 20 +- .../services/YARN/configuration/yarn-env.xml | 4 +- .../services/YARN/configuration/yarn-site.xml | 224 +++---- .../configuration/falcon-startup.properties.xml | 4 +- .../services/HBASE/configuration/hbase-site.xml | 24 +- .../services/HDFS/configuration/hdfs-site.xml | 8 +- .../HIVE/configuration/webhcat-site.xml | 4 +- .../services/OOZIE/configuration/oozie-env.xml | 24 +- .../services/OOZIE/configuration/oozie-site.xml | 32 +- .../services/STORM/configuration/storm-site.xml | 24 +- .../2.3/services/TEZ/configuration/tez-site.xml | 32 +- .../YARN/configuration/capacity-scheduler.xml | 12 +- .../services/HDFS/configuration/core-site.xml | 20 +- .../services/HDFS/configuration/hdfs-site.xml | 48 +- .../0.11.0.2.0.5.0/configuration/hive-site.xml | 148 ++--- .../HIVE/configuration/hive-site.xml | 148 ++--- .../services/HDFS/configuration/hbase-site.xml | 60 +- .../services/HDFS/configuration/hdfs-site.xml | 188 +++--- .../MAPREDUCE/configuration/hbase-site.xml | 60 +- .../MAPREDUCE/configuration/hdfs-site.xml | 188 +++--- .../MAPREDUCE/configuration/mapred-site.xml | 188 +++--- .../YARN/configuration/capacity-scheduler.xml | 12 +- .../services/YARN/configuration/yarn-site.xml | 20 +- .../HBASE/1.0/configuration/hbase-site.xml | 60 +- .../HDFS/1.0/configuration/hbase-site.xml | 60 +- .../HDFS/1.0/configuration/hdfs-site.xml | 188 +++--- .../MAPREDUCE/1.0/configuration/hbase-site.xml | 60 +- .../MAPREDUCE/1.0/configuration/hdfs-site.xml | 188 +++--- .../MAPREDUCE/1.0/configuration/mapred-site.xml | 188 +++--- .../services/HDFS/configuration/hbase-site.xml | 60 +- .../services/HDFS/configuration/hdfs-site.xml | 188 +++--- .../MAPREDUCE/configuration/hbase-site.xml | 60 +- .../MAPREDUCE/configuration/hdfs-site.xml | 188 +++--- .../MAPREDUCE/configuration/mapred-site.xml | 188 +++--- .../services/HBASE/configuration/hbase-site.xml | 60 +- .../0.2/services/HDFS/configuration/global.xml | 96 +-- .../services/HDFS/configuration/hadoop-env.xml | 68 +- .../services/HDFS/configuration/hbase-site.xml | 60 +- .../services/HDFS/configuration/hdfs-log4j.xml | 4 +- .../services/HDFS/configuration/hdfs-site.xml | 188 +++--- .../services/MAPREDUCE/configuration/global.xml | 108 ++-- .../MAPREDUCE/configuration/hbase-site.xml | 60 +- .../MAPREDUCE/configuration/hdfs-site.xml | 188 +++--- .../MAPREDUCE/configuration/mapred-site.xml | 188 +++--- .../HBASE/configuration/hbase-policy.xml | 12 +- .../services/HBASE/configuration/hbase-site.xml | 136 ++-- .../services/HDFS/configuration/core-site.xml | 68 +- .../HDFS/configuration/hadoop-policy.xml | 44 +- .../services/HDFS/configuration/hdfs-site.xml | 196 +++--- .../services/HIVE/configuration/hive-site.xml | 72 +-- .../configuration/capacity-scheduler.xml | 68 +- .../configuration/mapred-queue-acls.xml | 8 +- .../MAPREDUCE/configuration/mapred-site.xml | 292 ++++----- .../services/OOZIE/configuration/oozie-site.xml | 104 ++-- .../WEBHCAT/configuration/webhcat-site.xml | 64 +- .../services/GANGLIA/configuration/global.xml | 24 +- .../services/HBASE/configuration/global.xml | 120 ++-- .../HBASE/configuration/hbase-policy.xml | 12 +- .../services/HBASE/configuration/hbase-site.xml | 144 ++--- .../services/HCATALOG/configuration/global.xml | 16 +- .../services/HDFS/configuration/core-site.xml | 68 +- .../services/HDFS/configuration/global.xml | 140 ++--- .../HDFS/configuration/hadoop-policy.xml | 44 +- .../services/HDFS/configuration/hdfs-site.xml | 200 +++--- .../services/HIVE/configuration/global.xml | 76 +-- .../services/HIVE/configuration/hive-site.xml | 132 ++-- .../1.3.0/services/HUE/configuration/global.xml | 8 +- .../services/HUE/configuration/hue-site.xml | 168 ++--- .../configuration/capacity-scheduler.xml | 68 +- .../services/MAPREDUCE/configuration/global.xml | 108 ++-- .../configuration/mapred-queue-acls.xml | 8 +- .../MAPREDUCE/configuration/mapred-site.xml | 292 ++++----- .../services/OOZIE/configuration/global.xml | 64 +- .../services/OOZIE/configuration/oozie-site.xml | 104 ++-- .../WEBHCAT/configuration/webhcat-site.xml | 64 +- .../services/ZOOKEEPER/configuration/global.xml | 40 +- .../HBASE/configuration/hbase-policy.xml | 12 +- .../services/HBASE/configuration/hbase-site.xml | 132 ++-- .../services/HCFS/configuration/core-site.xml | 68 +- .../HCFS/configuration/hadoop-policy.xml | 44 +- .../services/HCFS/configuration/hdfs-site.xml | 196 +++--- .../services/HDFS/configuration/core-site.xml | 68 +- .../HDFS/configuration/hadoop-policy.xml | 44 +- .../services/HDFS/configuration/hdfs-site.xml | 196 +++--- .../services/HIVE/configuration/hive-site.xml | 72 +-- .../configuration/capacity-scheduler.xml | 68 +- .../configuration/mapred-queue-acls.xml | 8 +- .../MAPREDUCE/configuration/mapred-site.xml | 288 ++++----- .../services/OOZIE/configuration/oozie-site.xml | 104 ++-- .../WEBHCAT/configuration/webhcat-site.xml | 64 +- .../services/HDFS/configuration/hdfs-log4j.xml | 4 +- .../HBASE/configuration/hbase-policy.xml | 12 +- .../services/HBASE/configuration/hbase-site.xml | 136 ++-- .../services/HDFS/configuration/core-site.xml | 68 +- .../services/HDFS/configuration/global.xml | 140 ++--- .../HDFS/configuration/hadoop-policy.xml | 44 +- .../services/HDFS/configuration/hdfs-site.xml | 196 +++--- .../services/HIVE/configuration/hive-site.xml | 72 +-- .../MAPREDUCE2/configuration/global.xml | 16 +- .../configuration/mapred-queue-acls.xml | 8 +- .../MAPREDUCE2/configuration/mapred-site.xml | 172 +++-- .../services/OOZIE/configuration/oozie-site.xml | 104 ++-- .../WEBHCAT/configuration/webhcat-site.xml | 64 +- .../YARN/configuration/capacity-scheduler.xml | 44 +- .../services/YARN/configuration/global.xml | 20 +- .../services/YARN/configuration/yarn-site.xml | 104 ++-- .../services/HBASE/configuration/global.xml | 120 ++-- .../HBASE/configuration/hbase-policy.xml | 12 +- .../services/HBASE/configuration/hbase-site.xml | 148 ++--- .../services/HDFS/configuration/core-site.xml | 60 +- .../services/HDFS/configuration/global.xml | 136 ++-- .../HDFS/configuration/hadoop-policy.xml | 44 +- .../services/HDFS/configuration/hdfs-site.xml | 212 +++---- .../services/HIVE/configuration/hive-site.xml | 144 ++--- .../MAPREDUCE2/configuration/global.xml | 16 +- .../configuration/mapred-queue-acls.xml | 8 +- .../MAPREDUCE2/configuration/mapred-site.xml | 164 +++-- .../services/OOZIE/configuration/oozie-site.xml | 104 ++-- .../YARN/configuration/capacity-scheduler.xml | 44 +- .../services/YARN/configuration/global.xml | 32 +- .../services/YARN/configuration/yarn-site.xml | 136 ++-- .../services/ZOOKEEPER/configuration/global.xml | 40 +- .../ZOOKEEPER/configuration/zoo.cfg.xml | 28 +- .../services/FLUME/configuration/flume-conf.xml | 4 +- .../services/FLUME/configuration/flume-env.xml | 12 +- .../FLUME/configuration/flume-log4j.xml | 4 +- .../services/FLUME/configuration/flume-conf.xml | 4 +- .../services/FLUME/configuration/flume-env.xml | 12 +- .../FLUME/configuration/flume-log4j.xml | 4 +- .../services/YARN/configuration/yarn-site.xml | 36 +- .../services/HBASE/configuration/global.xml | 116 ++-- .../HBASE/configuration/hbase-policy.xml | 12 +- .../services/HBASE/configuration/hbase-site.xml | 144 ++--- .../services/HDFS/configuration/core-site.xml | 48 +- .../services/HDFS/configuration/global.xml | 140 ++--- .../HDFS/configuration/hadoop-policy.xml | 44 +- .../services/HDFS/configuration/hdfs-site.xml | 236 +++---- .../services/HIVE/configuration/hive-site.xml | 148 ++--- .../services/YARN/configuration/yarn-site.xml | 20 +- .../services/HBASE/configuration/hbase-site.xml | 144 ++--- .../services/HDFS/configuration/hdfs-site.xml | 12 +- .../PIG/configuration/pig-properties.xml | 4 +- .../services/HDFS/configuration/hdfs-site.xml | 12 +- .../0.2/services/HDFS/configuration/global.xml | 96 +-- .../services/HDFS/configuration/hadoop-env.xml | 68 +- .../services/HDFS/configuration/hbase-site.xml | 60 +- .../services/HDFS/configuration/hdfs-log4j.xml | 4 +- .../services/HDFS/configuration/hdfs-site.xml | 188 +++--- .../services/HDFS/configuration/hdfs-site.xml | 12 +- 579 files changed, 16348 insertions(+), 16354 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b7c95413/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml index 500e331..aad769f 100644 --- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml +++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml @@ -32,8 +32,8 @@ <type>password</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 require-input="true"> <name>instance_secret</name> @@ -48,8 +48,8 @@ <editable-only-at-install>true</editable-only-at-install> <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 require-input="false"> <name>trace_password</name> @@ -63,8 +63,8 @@ <type>password</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>accumulo_log_dir</name> @@ -75,8 +75,8 @@ <type>directory</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>accumulo_pid_dir</name> @@ -88,8 +88,8 @@ <editable-only-at-install>true</editable-only-at-install> <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>accumulo_instance_name</name> @@ -100,8 +100,8 @@ <editable-only-at-install>true</editable-only-at-install> <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>accumulo_user</name> @@ -113,8 +113,8 @@ <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>accumulo_master_heapsize</name> @@ -126,8 +126,8 @@ <unit>MB</unit> <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>accumulo_tserver_heapsize</name> @@ -138,8 +138,8 @@ <type>int</type> <unit>MB</unit> </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>accumulo_monitor_heapsize</name> @@ -151,8 +151,8 @@ <unit>MB</unit> <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>accumulo_gc_heapsize</name> @@ -164,8 +164,8 @@ <unit>MB</unit> <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>accumulo_other_heapsize</name> @@ -176,8 +176,8 @@ <type>int</type> <unit>MB</unit> </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>accumulo_monitor_bind_all</name> @@ -187,20 +187,20 @@ <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>accumulo_user_keytab</name> <description>Accumulo keytab path</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>accumulo_principal_name</name> <description>Accumulo principal name</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>content</name> @@ -226,8 +226,8 @@ export ACCUMULO_KILL_CMD='kill -9 %p' <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> <property> <name>server_content</name> @@ -255,7 +255,7 @@ export ACCUMULO_KILL_CMD='kill -9 %p' <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/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-log4j.xml b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-log4j.xml index cac3bd3..06f134f 100644 --- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-log4j.xml +++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-log4j.xml @@ -24,44 +24,44 @@ <name>audit_log_level</name> <value>OFF</value> <description>Log level for audit logging</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>monitor_forwarding_log_level</name> <value>WARN</value> <description>Log level for logging forwarded to the Accumulo Monitor</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>debug_log_size</name> <value>512M</value> <description>Size of each debug rolling log 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>debug_num_logs</name> <value>10</value> <description>Number of rolling debug log files to keep</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>info_log_size</name> <value>512M</value> <description>Size of each info rolling log 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>info_num_logs</name> <value>10</value> <description>Number of rolling info log files to keep</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>content</name> @@ -116,7 +116,7 @@ log4j.appender.A1.layout=org.apache.log4j.PatternLayout <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/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-site.xml b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-site.xml index 1342415..b857c20 100644 --- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-site.xml +++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-site.xml @@ -27,8 +27,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>instance.zookeeper.host</name> @@ -39,8 +39,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>instance.zookeeper.timeout</name> @@ -49,8 +49,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>tserver.memory.maps.max</name> @@ -60,8 +60,8 @@ (tserver.memory.maps.native.enabled) this memory is off-heap. Ensure that table.compaction.minor.logs.threshold * tserver.walog.max.size >= tserver.memory.maps.max.</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>tserver.memory.maps.native.enabled</name> @@ -72,37 +72,37 @@ <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>tserver.cache.data.size</name> <value>128M</value> <description>Size of on-heap block cache for data blocks.</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>tserver.cache.index.size</name> <value>256M</value> <description>Size of on-heap block cache for index blocks.</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>tserver.sort.buffer.size</name> <value>200M</value> <description>Amount of memory to use for sorting walogs when recovering from tserver failure.</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>tserver.walog.max.size</name> <value>1G</value> <description>Maximum size of each write-ahead log.</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>master.port.client</name> @@ -111,8 +111,8 @@ <value-attributes> <type>int</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>trace.port.client</name> @@ -122,8 +122,8 @@ <value-attributes> <type>int</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>tserver.port.client</name> @@ -132,8 +132,8 @@ <value-attributes> <type>int</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>gc.port.client</name> @@ -143,8 +143,8 @@ <value-attributes> <type>int</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>monitor.port.client</name> @@ -153,8 +153,8 @@ <value-attributes> <type>int</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>monitor.port.log4j</name> @@ -164,8 +164,8 @@ <value-attributes> <type>int</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>trace.user</name> @@ -176,8 +176,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>general.classpaths</name> @@ -203,7 +203,7 @@ $HADOOP_PREFIX/share/hadoop/yarn/lib/jersey.*.jar <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/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml index 77e4931..4ee892c 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml @@ -28,8 +28,8 @@ <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>metrics_collector_log_dir</name> @@ -39,8 +39,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>metrics_collector_pid_dir</name> @@ -50,8 +50,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>metrics_monitor_pid_dir</name> @@ -61,8 +61,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>metrics_monitor_log_dir</name> @@ -72,8 +72,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>metrics_collector_heapsize</name> @@ -83,8 +83,8 @@ <type>int</type> <unit>MB</unit> </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>content</name> @@ -136,7 +136,7 @@ export AMS_COLLECTOR_OPTS="$AMS_COLLECTOR_OPTS $AMS_COLLECTOR_GC_OPTS" <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/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-env.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-env.xml index 036d83a..d097730 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-env.xml +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-env.xml @@ -23,24 +23,24 @@ <value>/var/log/ambari-metrics-grafana</value> <display-name>Metrics Grafana log dir</display-name> <description>Metrics Grafana log 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>metrics_grafana_pid_dir</name> <value>/var/run/ambari-metrics-grafana</value> <display-name>Metrics Grafana pid dir</display-name> <description>Metrics Grafana pid 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>metrics_grafana_data_dir</name> <value>/var/lib/ambari-metrics-grafana</value> <display-name>Metrics Grafana data dir</display-name> <description>Metrics Grafana 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>metrics_grafana_username</name> @@ -55,8 +55,8 @@ <type>db_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 require-input="true"> <name>metrics_grafana_password</name> @@ -72,8 +72,8 @@ <overridable>false</overridable> <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>content</name> @@ -93,7 +93,7 @@ export AMS_GRAFANA_LOG_DIR={{ams_grafana_log_dir}} # AMS UI Server PID Dir export AMS_GRAFANA_PID_DIR={{ams_grafana_pid_dir}} </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/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-ini.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-ini.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-ini.xml index 2a29020..033b038 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-ini.xml +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-grafana-ini.xml @@ -22,29 +22,29 @@ <name>port</name> <value>3000</value> <description>The http port to use</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>protocol</name> <value>http</value> <description>Protocol (http or https)</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>cert_file</name> <value>/etc/ambari-metrics-grafana/conf/ams-grafana.crt</value> <description>Path to grafana certificate (.crt) 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>cert_key</name> <value>/etc/ambari-metrics-grafana/conf/ams-grafana.key</value> <description>Path to grafana certificate key (.key) 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>content</name> @@ -308,7 +308,7 @@ org_name = Main Org. ;path = /var/lib/grafana/dashboards path = /usr/lib/ambari-metrics-grafana/public/dashboards </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/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml index c673b68..ec85f02 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml @@ -33,8 +33,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>hbase_pid_dir</name> @@ -43,8 +43,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>hbase_classpath_additional</name> @@ -53,8 +53,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>hbase_regionserver_heapsize</name> @@ -77,8 +77,8 @@ <name>hbase.rootdir</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>regionserver_xmn_size</name> @@ -94,8 +94,8 @@ <name>hbase.cluster.distributed</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>hbase_master_xmn_size</name> @@ -113,8 +113,8 @@ <name>hbase.cluster.distributed</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>hbase_master_maxperm_size</name> @@ -124,15 +124,15 @@ <type>int</type> <unit>MB</unit> </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>hbase_regionserver_xmn_ratio</name> <value>0.2</value> <description>Percentage of max heap size (-Xmx) which used for young generation heap (-Xmn).</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>hbase_master_heapsize</name> @@ -155,8 +155,8 @@ <name>hbase.rootdir</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>max_open_files_limit</name> @@ -164,8 +164,8 @@ <description> The maximum number of open file descriptors by process </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> <!-- hbase-env.sh --> <property> @@ -267,7 +267,7 @@ export HBASE_HOME={{ams_hbase_home_dir}} <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/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-log4j.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-log4j.xml index ea4871a..55bd8f4 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-log4j.xml +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-log4j.xml @@ -141,7 +141,7 @@ log4j.logger.org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher=INFO <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/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-policy.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-policy.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-policy.xml index e65df89..a187ffe 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-policy.xml +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-policy.xml @@ -28,8 +28,8 @@ The ACL is a comma-separated list of user and group names. The user and group list is separated by a blank. For e.g. "alice,bob users,wheel". A special value of "*" means all users are allowed.</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>security.admin.protocol.acl</name> @@ -39,8 +39,8 @@ The ACL is a comma-separated list of user and group names. The user and group list is separated by a blank. For e.g. "alice,bob users,wheel". A special value of "*" means all users are allowed.</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>security.masterregion.protocol.acl</name> @@ -50,7 +50,7 @@ The ACL is a comma-separated list of user and group names. The user and group list is separated by a blank. For e.g. "alice,bob users,wheel". A special value of "*" means all users are allowed.</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/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-security-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-security-site.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-security-site.xml index 170448b..2a0acd1 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-security-site.xml +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-security-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>ams.zookeeper.principal</name> @@ -35,8 +35,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>hadoop.security.authentication</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>hbase.coprocessor.master.classes</name> @@ -53,8 +53,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>hbase.coprocessor.region.classes</name> @@ -62,8 +62,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>hbase.master.kerberos.principal</name> @@ -71,8 +71,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>hbase.master.keytab.file</name> @@ -80,8 +80,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>hbase.myclient.keytab</name> @@ -89,8 +89,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>hbase.myclient.principal</name> @@ -98,8 +98,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>hbase.regionserver.kerberos.principal</name> @@ -107,8 +107,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>hbase.regionserver.keytab.file</name> @@ -116,8 +116,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>hbase.security.authentication</name> @@ -125,8 +125,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>hbase.security.authorization</name> @@ -134,8 +134,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>hbase.zookeeper.property.authProvider.1</name> @@ -143,8 +143,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>hbase.zookeeper.property.jaasLoginRenew</name> @@ -152,8 +152,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>hbase.zookeeper.property.kerberos.removeHostFromPrincipal</name> @@ -161,8 +161,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>hbase.zookeeper.property.kerberos.removeRealmFromPrincipal</name> @@ -170,7 +170,7 @@ <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> </configuration>
