You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2016/02/10 20:27:08 UTC
ambari git commit: AMBARI-14979. Ambari Upgrade should not
automatically add stack properties that reference localhost like
dfs.namenode.secondary.http-address, mark with DONT_ADD_ON_UPGRADE (alejandro)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 1abfb8bd0 -> 99f00ca8a
AMBARI-14979. Ambari Upgrade should not automatically add stack properties that reference localhost like dfs.namenode.secondary.http-address, mark with DONT_ADD_ON_UPGRADE (alejandro)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/99f00ca8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/99f00ca8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/99f00ca8
Branch: refs/heads/branch-2.2
Commit: 99f00ca8a9e1e777cd2e1d27470c984c4771dfef
Parents: 1abfb8b
Author: Alejandro Fernandez <af...@hortonworks.com>
Authored: Mon Feb 8 18:39:58 2016 -0800
Committer: Alejandro Fernandez <af...@hortonworks.com>
Committed: Wed Feb 10 11:27:00 2016 -0800
----------------------------------------------------------------------
.../ACCUMULO/1.6.1.2.2.0/configuration/accumulo-site.xml | 2 ++
.../ATLAS/0.1.0.2.3/configuration/application-properties.xml | 1 +
.../0.5.0.2.1/configuration/falcon-startup.properties.xml | 1 +
.../HBASE/0.96.0.2.0/configuration/hbase-site.xml | 1 +
.../HDFS/2.1.0.2.0/configuration/core-site.xml | 1 +
.../HDFS/2.1.0.2.0/configuration/hdfs-site.xml | 3 +++
.../HIVE/0.12.0.2.0/configuration/hive-site.xml | 3 +++
.../HIVE/0.12.0.2.0/configuration/webhcat-site.xml | 1 +
.../KAFKA/0.8.1.2.2/configuration/kafka-broker.xml | 2 ++
.../configuration/ranger-knox-plugin-properties.xml | 1 +
.../OOZIE/4.0.0.2.0/configuration/oozie-site.xml | 1 +
.../OOZIE/4.2.0.2.3/configuration/oozie-site.xml | 1 +
.../RANGER/0.4.0/configuration/ranger-env.xml | 1 +
.../RANGER_KMS/0.5.0.2.3/configuration/kms-site.xml | 1 +
.../STORM/0.9.1.2.1/configuration/storm-site.xml | 1 +
.../YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml | 2 ++
.../YARN/2.1.0.2.0/configuration/yarn-site.xml | 8 ++++++++
.../stacks/HDP/2.1/services/HIVE/configuration/hive-site.xml | 2 ++
.../HDP/2.1/services/OOZIE/configuration/oozie-site.xml | 1 +
.../stacks/HDP/2.1/services/YARN/configuration/yarn-site.xml | 3 +++
.../HBASE/configuration/ranger-hbase-plugin-properties.xml | 1 +
.../HDFS/configuration/ranger-hdfs-plugin-properties.xml | 4 ++--
.../stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml | 4 ++++
.../HIVE/configuration/ranger-hive-plugin-properties.xml | 1 +
.../STORM/configuration/ranger-storm-plugin-properties.xml | 1 +
.../stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml | 2 ++
.../HDP/2.3/services/KAFKA/configuration/kafka-broker.xml | 1 +
.../KAFKA/configuration/ranger-kafka-plugin-properties.xml | 1 +
.../2.3/services/RANGER/configuration/ranger-admin-site.xml | 1 +
.../HDP/2.3/services/RANGER/configuration/ranger-env.xml | 2 ++
.../HDP/2.3/services/STORM/configuration/storm-site.xml | 2 ++
31 files changed, 55 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/99f00ca8/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 2e75768..c2e0200 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
@@ -24,6 +24,7 @@
<property>
<name>instance.volumes</name>
<value>hdfs://localhost:8020/apps/accumulo/data</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>Location of Accumulo data files in HDFS.</description>
<value-attributes>
<overridable>false</overridable>
@@ -33,6 +34,7 @@
<property>
<name>instance.zookeeper.host</name>
<value>localhost:2181</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>Comma-separated list of ZooKeeper server:port
pairs.</description>
<value-attributes>
http://git-wip-us.apache.org/repos/asf/ambari/blob/99f00ca8/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/application-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/application-properties.xml b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/application-properties.xml
index 82dacb6..986dfa1 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/application-properties.xml
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/application-properties.xml
@@ -102,6 +102,7 @@
<property>
<name>atlas.server.bind.address</name>
<value>localhost</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description></description>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/99f00ca8/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-startup.properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-startup.properties.xml b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-startup.properties.xml
index 66a297c..431d963 100644
--- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-startup.properties.xml
+++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-startup.properties.xml
@@ -120,6 +120,7 @@
<property>
<name>*.broker.url</name>
<value>tcp://localhost:61616</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>Default Active MQ url</description>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/99f00ca8/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml
index 4fefb1e..3575bf2 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml
@@ -23,6 +23,7 @@
<property>
<name>hbase.rootdir</name>
<value>hdfs://localhost:8020/apps/hbase/data</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>The directory shared by region servers and into
which HBase persists. The URL should be 'fully-qualified'
to include the filesystem scheme. For example, to specify the
http://git-wip-us.apache.org/repos/asf/ambari/blob/99f00ca8/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/core-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/core-site.xml b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/core-site.xml
index 4d73250..d216605 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/core-site.xml
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/core-site.xml
@@ -59,6 +59,7 @@
<name>fs.defaultFS</name>
<!-- cluster variant -->
<value>hdfs://localhost:8020</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>The name of the default file system. Either the
literal string "local" or a host:port for HDFS.</description>
<final>true</final>
http://git-wip-us.apache.org/repos/asf/ambari/blob/99f00ca8/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-site.xml b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-site.xml
index 0585aa3..914a100 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-site.xml
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-site.xml
@@ -255,6 +255,7 @@
<property>
<name>dfs.namenode.http-address</name>
<value>localhost:50070</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>The name of the default file system. Either the
literal string "local" or a host:port for HDFS.</description>
<final>true</final>
@@ -360,6 +361,7 @@
<!-- cluster variant -->
<name>dfs.namenode.secondary.http-address</name>
<value>localhost:50090</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>Address of secondary namenode web server</description>
</property>
@@ -367,6 +369,7 @@
<property>
<name>dfs.namenode.https-address</name>
<value>localhost:50470</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>The https address where namenode binds</description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/99f00ca8/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml
index bf829b4..dde726a 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml
@@ -46,6 +46,7 @@ limitations under the License.
<property>
<name>javax.jdo.option.ConnectionURL</name>
<value>jdbc:mysql://localhost/hive?createDatabaseIfNotExist=true</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<display-name>Database URL</display-name>
<description>JDBC connect string for a JDBC metastore</description>
<value-attributes>
@@ -107,6 +108,7 @@ limitations under the License.
<property>
<name>hive.metastore.uris</name>
<value>thrift://localhost:9083</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>URI for client to contact metastore server</description>
</property>
@@ -427,6 +429,7 @@ limitations under the License.
<property>
<name>atlas.rest.address</name>
<value>http://localhost:21000</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<depends-on>
<property>
<type>application-properties</type>
http://git-wip-us.apache.org/repos/asf/ambari/blob/99f00ca8/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/webhcat-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/webhcat-site.xml b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/webhcat-site.xml
index 72a5710..be2f221 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/webhcat-site.xml
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/webhcat-site.xml
@@ -117,6 +117,7 @@ limitations under the License.
<property>
<name>templeton.zookeeper.hosts</name>
<value>localhost:2181</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>ZooKeeper servers, as comma separated host:port pairs</description>
<value-attributes>
<type>multiLine</type>
http://git-wip-us.apache.org/repos/asf/ambari/blob/99f00ca8/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-broker.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-broker.xml b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-broker.xml
index b23075d..6d0c8c6 100644
--- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-broker.xml
+++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-broker.xml
@@ -45,6 +45,7 @@
<property>
<name>zookeeper.connect</name>
<value>localhost:2181</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>
Zookeeper also allows you to add a "chroot" path which will make all kafka data for this cluster appear under a particular path.
This is a way to setup multiple Kafka clusters or other applications on the same zookeeper cluster. To do this give a connection
@@ -295,6 +296,7 @@
<property>
<name>kafka.ganglia.metrics.host</name>
<value>localhost</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description> Ganglia host </description>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/99f00ca8/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ranger-knox-plugin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ranger-knox-plugin-properties.xml b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ranger-knox-plugin-properties.xml
index 4357d48..b2fca77 100644
--- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ranger-knox-plugin-properties.xml
+++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ranger-knox-plugin-properties.xml
@@ -110,6 +110,7 @@
<property>
<name>XAAUDIT.HDFS.DESTINATION_DIRECTORY</name>
<value>hdfs://localhost:8020/ranger/audit/%app-type%/%time:yyyyMMdd%</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description></description>
<depends-on>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/99f00ca8/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-site.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-site.xml
index 047bdd2..623306d 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-site.xml
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-site.xml
@@ -26,6 +26,7 @@
<property>
<name>oozie.base.url</name>
<value>http://localhost:11000/oozie</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>Base Oozie URL.</description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/99f00ca8/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-site.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-site.xml
index c1eff67..79850e8 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-site.xml
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-site.xml
@@ -35,6 +35,7 @@
<property>
<name>oozie.base.url</name>
<value>http://localhost:11000/oozie</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>Base Oozie URL.</description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/99f00ca8/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml
index 31608a9..752da6d 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml
@@ -262,6 +262,7 @@
<property>
<name>xasecure.audit.destination.hdfs.dir</name>
<value>hdfs://localhost:8020/ranger/audit/%app-type%/%time:yyyyMMdd%</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<display-name>Destination HDFS Directory</display-name>
<description>HDFS folder to write audit to, make sure all service user has required permissions. This property is overridable at service level</description>
<depends-on>
http://git-wip-us.apache.org/repos/asf/ambari/blob/99f00ca8/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-site.xml b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-site.xml
index 889e310..e559d92 100644
--- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-site.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-site.xml
@@ -23,6 +23,7 @@
<property>
<name>hadoop.kms.key.provider.uri</name>
<value>dbks://http@localhost:9292/kms</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>URI of the backing KeyProvider for the KMS.</description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/99f00ca8/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-site.xml b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-site.xml
index 4719dbb..aada363 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-site.xml
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-site.xml
@@ -42,6 +42,7 @@
<property>
<name>storm.zookeeper.servers</name>
<value>['localhost']</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>A list of hosts of ZooKeeper servers used to manage the cluster.</description>
<value-attributes>
<type>multiLine</type>
http://git-wip-us.apache.org/repos/asf/ambari/blob/99f00ca8/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml
index 5737c4d..f30b807 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml
@@ -257,12 +257,14 @@
<property>
<name>mapreduce.jobhistory.address</name>
<value>localhost:10020</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>Enter your JobHistoryServer hostname.</description>
</property>
<property>
<name>mapreduce.jobhistory.webapp.address</name>
<value>localhost:19888</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>Enter your JobHistoryServer hostname.</description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/99f00ca8/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-site.xml b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-site.xml
index 802a1f5..59d4964 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-site.xml
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-site.xml
@@ -26,24 +26,28 @@
<property>
<name>yarn.resourcemanager.hostname</name>
<value>localhost</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>The hostname of the RM.</description>
</property>
<property>
<name>yarn.resourcemanager.resource-tracker.address</name>
<value>localhost:8025</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description> The address of ResourceManager. </description>
</property>
<property>
<name>yarn.resourcemanager.scheduler.address</name>
<value>localhost:8030</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>The address of the scheduler interface.</description>
</property>
<property>
<name>yarn.resourcemanager.address</name>
<value>localhost:8050</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>
The address of the applications manager interface in the
RM.
@@ -53,6 +57,7 @@
<property>
<name>yarn.resourcemanager.admin.address</name>
<value>localhost:8141</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>The address of the RM admin interface.</description>
</property>
@@ -372,6 +377,7 @@
<property>
<name>yarn.resourcemanager.webapp.address</name>
<value>localhost:8088</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>
The address of the RM web application.
</description>
@@ -380,6 +386,7 @@
<property>
<name>yarn.resourcemanager.webapp.https.address</name>
<value>localhost:8090</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>
The https address of the RM web application.
</description>
@@ -396,6 +403,7 @@
<property>
<name>yarn.log.server.url</name>
<value>http://localhost:19888/jobhistory/logs</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>
URI for the HistoryServer's log resource
</description>
http://git-wip-us.apache.org/repos/asf/ambari/blob/99f00ca8/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/configuration/hive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/configuration/hive-site.xml
index b771002..b444c11 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/configuration/hive-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/configuration/hive-site.xml
@@ -44,6 +44,7 @@ limitations under the License.
<property>
<name>javax.jdo.option.ConnectionURL</name>
<value>jdbc:mysql://localhost/hive?createDatabaseIfNotExist=true</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<display-name>Database URL</display-name>
<description>JDBC connect string for a JDBC metastore</description>
<value-attributes>
@@ -119,6 +120,7 @@ limitations under the License.
<property>
<name>hive.metastore.uris</name>
<value>thrift://localhost:9083</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>URI for client to contact metastore server</description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/99f00ca8/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/configuration/oozie-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/configuration/oozie-site.xml
index af1a0a8..b4d2965 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/configuration/oozie-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/configuration/oozie-site.xml
@@ -26,6 +26,7 @@
<property>
<name>oozie.base.url</name>
<value>http://localhost:11000/oozie</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>Base Oozie URL.</description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/99f00ca8/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/configuration/yarn-site.xml
index 667c374..732cef1 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/configuration/yarn-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/configuration/yarn-site.xml
@@ -61,6 +61,7 @@
<property>
<name>yarn.timeline-service.webapp.address</name>
<value>localhost:8188</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>
The http address of the timeline service web application.
</description>
@@ -69,6 +70,7 @@
<property>
<name>yarn.timeline-service.webapp.https.address</name>
<value>localhost:8190</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>
The http address of the timeline service web application.
</description>
@@ -77,6 +79,7 @@
<property>
<name>yarn.timeline-service.address</name>
<value>localhost:10200</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>
This is default address for the timeline server to start
the RPC server.
http://git-wip-us.apache.org/repos/asf/ambari/blob/99f00ca8/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/ranger-hbase-plugin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/ranger-hbase-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/ranger-hbase-plugin-properties.xml
index e1d2a65..9ac65dd 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/ranger-hbase-plugin-properties.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/ranger-hbase-plugin-properties.xml
@@ -103,6 +103,7 @@
<property>
<name>XAAUDIT.HDFS.DESTINATION_DIRECTORY</name>
<value>hdfs://localhost:8020/ranger/audit/%app-type%/%time:yyyyMMdd%</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description></description>
<depends-on>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/99f00ca8/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/ranger-hdfs-plugin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/ranger-hdfs-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/ranger-hdfs-plugin-properties.xml
index c7a62bc..a9fbcac 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/ranger-hdfs-plugin-properties.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/ranger-hdfs-plugin-properties.xml
@@ -108,8 +108,8 @@
<property>
<name>XAAUDIT.HDFS.DESTINATION_DIRECTORY</name>
- <value>hdfs://localhost:8020/ranger/audit/%app-type%/%time:yyyyMMdd%
- </value>
+ <value>hdfs://localhost:8020/ranger/audit/%app-type%/%time:yyyyMMdd%</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description></description>
<depends-on>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/99f00ca8/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
index cc3e75f..2076049 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
@@ -43,6 +43,7 @@ limitations under the License.
<property>
<name>hive.zookeeper.quorum</name>
<value>localhost:2181</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>List of ZooKeeper servers to talk to. This is needed for: 1.
Read/write locks - when hive.lock.manager is set to
org.apache.hadoop.hive.ql.lockmgr.zookeeper.ZooKeeperHiveLockManager,
@@ -114,6 +115,7 @@ limitations under the License.
<property>
<name>hive.cluster.delegation.token.store.zookeeper.connectString</name>
<value>localhost:2181</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>The ZooKeeper token store connect string.</description>
</property>
@@ -345,6 +347,7 @@ limitations under the License.
<property>
<name>hive.metastore.uris</name>
<value>thrift://localhost:9083</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>Thrift URI for the remote metastore. Used by metastore client to connect to remote metastore.</description>
</property>
@@ -362,6 +365,7 @@ limitations under the License.
<property>
<name>javax.jdo.option.ConnectionURL</name>
<value>jdbc:mysql://localhost/hive?createDatabaseIfNotExist=true</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<display-name>Database URL</display-name>
<description>JDBC connect string for a JDBC metastore</description>
<value-attributes>
http://git-wip-us.apache.org/repos/asf/ambari/blob/99f00ca8/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml
index ae48dd7..f96f26d 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml
@@ -92,6 +92,7 @@
<property>
<name>XAAUDIT.HDFS.DESTINATION_DIRECTORY</name>
<value>hdfs://localhost:8020/ranger/audit/%app-type%/%time:yyyyMMdd%</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description></description>
<depends-on>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/99f00ca8/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/ranger-storm-plugin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/ranger-storm-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/ranger-storm-plugin-properties.xml
index 824cfba..ac7d105 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/ranger-storm-plugin-properties.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/ranger-storm-plugin-properties.xml
@@ -103,6 +103,7 @@
<property>
<name>XAAUDIT.HDFS.DESTINATION_DIRECTORY</name>
<value>hdfs://localhost:8020/ranger/audit/%app-type%/%time:yyyyMMdd%</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description></description>
<depends-on>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/99f00ca8/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml
index e75442f..ee12ba3 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml
@@ -39,6 +39,7 @@
<property>
<name>hadoop.registry.zk.quorum</name>
<value>localhost:2181</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>
List of hostname:port pairs defining the zookeeper quorum binding for the registry
</description>
@@ -98,6 +99,7 @@
<property>
<name>yarn.resourcemanager.zk-address</name>
<value>localhost:2181</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>
List Host:Port of the ZooKeeper servers to be used by the RM. comma separated host:port pairs, each corresponding to a zk server. e.g. "127.0.0.1:3000,127.0.0.1:3001,127.0.0.1:3002" If the optional chroot suffix is used the example would look like: "127.0.0.1:3000,127.0.0.1:3001,127.0.0.1:3002/app/a" where the client would be rooted at "/app/a" and all paths would be relative to this root - ie getting/setting/etc... "/foo/bar" would result in operations being run on "/app/a/foo/bar" (from the server perspective).
</description>
http://git-wip-us.apache.org/repos/asf/ambari/blob/99f00ca8/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/kafka-broker.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/kafka-broker.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/kafka-broker.xml
index 8c2f34a..6e924e2 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/kafka-broker.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/kafka-broker.xml
@@ -22,6 +22,7 @@
<property>
<name>listeners</name>
<value>PLAINTEXT://localhost:6667</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>host and port where kafka broker will be accepting connnections. localhost will be subsituted with hostname.</description>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/99f00ca8/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-plugin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-plugin-properties.xml
index 7dce46f..5e64a88 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-plugin-properties.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-plugin-properties.xml
@@ -48,6 +48,7 @@
<property>
<name>zookeeper.connect</name>
<value>localhost:2181</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>Used for repository creation on ranger admin</description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/99f00ca8/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml
index 590b3ed..16fae19 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml
@@ -108,6 +108,7 @@
<property>
<name>ranger.jpa.jdbc.url</name>
<value>jdbc:mysql://localhost</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>JDBC connect string - auto populated based on other values</description>
<display-name>JDBC connect string</display-name>
<value-attributes>
http://git-wip-us.apache.org/repos/asf/ambari/blob/99f00ca8/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-env.xml
index eec7436..dc90610 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-env.xml
@@ -58,6 +58,7 @@
<display-name>JDBC connect string for root user</display-name>
<description>JDBC connect string - auto populated based on other values. This is to be used by root user</description>
<value>jdbc:mysql://localhost</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<value-attributes>
<overridable>false</overridable>
</value-attributes>
@@ -187,6 +188,7 @@
<property>
<name>xasecure.audit.destination.hdfs.dir</name>
<value>hdfs://localhost:8020</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<display-name>Destination HDFS Directory</display-name>
<description>HDFS folder to write audit to, make sure all service user has required permissions. This property is overridable at service level</description>
<depends-on>
http://git-wip-us.apache.org/repos/asf/ambari/blob/99f00ca8/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-site.xml
index ca6d2b6..6a5e6db 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-site.xml
@@ -22,6 +22,7 @@
<property>
<name>nimbus.seeds</name>
<value>localhost</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>Comma-delimited list of the hosts running nimbus server.</description>
<value-attributes>
<type>componentHosts</type>
@@ -52,6 +53,7 @@
<property>
<name>nimbus.host</name>
<value>localhost</value>
+ <property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>Deprecated config in favor of nimbus.seeds used during non HA mode.</description>
<deleted>true</deleted>
</property>