ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dmitriu...@apache.org
Subject [3/6] ambari git commit: AMBARI-17112. Fixed implementation of on-ambari-upgrade support. Patch 2: add logic for ambari-upgrade (dlysnichenko)
Date Tue, 14 Jun 2016 09:10:40 GMT
AMBARI-17112. Fixed implementation of on-ambari-upgrade support. Patch 2: add logic for ambari-upgrade (dlysnichenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0b48b1fe
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0b48b1fe
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0b48b1fe

Branch: refs/heads/trunk
Commit: 0b48b1fe8e8b5b91b8740ebb6c6319181a23313c
Parents: 46a8726
Author: Lisnichenko Dmitro <dlysnichenko@hortonworks.com>
Authored: Tue Jun 14 12:09:10 2016 +0300
Committer: Lisnichenko Dmitro <dlysnichenko@hortonworks.com>
Committed: Tue Jun 14 12:09:10 2016 +0300

----------------------------------------------------------------------
 .../server/stack/ConfigurationModule.java       |   2 +-
 .../ambari/server/state/PropertyInfo.java       |  14 --
 .../server/state/PropertyUpgradeBehavior.java   |  26 ++-
 .../server/upgrade/AbstractUpgradeCatalog.java  |  64 +++++--
 .../1.6.1.2.2.0/configuration/accumulo-site.xml |   6 +-
 .../configuration/application-properties.xml    |   3 +-
 .../configuration/falcon-startup.properties.xml |   3 +-
 .../0.96.0.2.0/configuration/hbase-site.xml     |   3 +-
 .../HDFS/2.1.0.2.0/configuration/core-site.xml  |   3 +-
 .../HDFS/2.1.0.2.0/configuration/hdfs-site.xml  |  12 +-
 .../HIVE/0.12.0.2.0/configuration/hive-site.xml |  12 +-
 .../0.12.0.2.0/configuration/webhcat-site.xml   |   3 +-
 .../KAFKA/0.8.1/configuration/kafka-broker.xml  |   6 +-
 .../KAFKA/0.9.0/configuration/kafka-broker.xml  |   6 +-
 .../ranger-kafka-plugin-properties.xml          |   3 +-
 .../ranger-knox-plugin-properties.xml           |   3 +-
 .../4.0.0.2.0/configuration/oozie-site.xml      |   3 +-
 .../4.2.0.2.3/configuration/oozie-site.xml      |   3 +-
 .../RANGER/0.4.0/configuration/ranger-env.xml   |   3 +-
 .../0.5.0/configuration/admin-properties.xml    |  39 ++--
 .../RANGER/0.5.0/configuration/ranger-env.xml   |   9 +-
 .../RANGER/0.5.0/configuration/ranger-site.xml  |  21 +--
 .../0.5.0/configuration/usersync-properties.xml |  51 ++---
 .../0.6.0/configuration/admin-properties.xml    |   9 +-
 .../0.6.0/configuration/ranger-admin-site.xml   |  24 +--
 .../RANGER/0.6.0/configuration/ranger-env.xml   |   3 +-
 .../0.5.0.2.3/configuration/kms-site.xml        |   3 +-
 .../1.6.0/configuration/spark-defaults.xml      |   3 +-
 .../configuration/spark-thrift-sparkconf.xml    |  27 +--
 .../ranger-storm-plugin-properties.xml          |  75 +++-----
 .../STORM/0.10.0/configuration/storm-site.xml   |   7 +-
 .../STORM/0.9.1/configuration/storm-site.xml    |   3 +-
 .../ranger-storm-plugin-properties.xml          |   3 +-
 .../1.0.1/configuration/ranger-storm-audit.xml  |  21 +--
 .../configuration-mapred/mapred-site.xml        |   6 +-
 .../configuration/capacity-scheduler.xml        |  39 ++--
 .../YARN/2.1.0.2.0/configuration/yarn-site.xml  |  24 +--
 .../src/main/resources/configuration-schema.xsd |   1 -
 .../services/HIVE/configuration/hive-site.xml   |   6 +-
 .../services/OOZIE/configuration/oozie-site.xml |   3 +-
 .../services/YARN/configuration/yarn-site.xml   |   9 +-
 .../services/HBASE/configuration/hbase-site.xml |   3 +-
 .../ranger-hbase-plugin-properties.xml          |   3 +-
 .../ranger-hdfs-plugin-properties.xml           |   3 +-
 .../services/HIVE/configuration/hive-site.xml   |  48 ++---
 .../ranger-hive-plugin-properties.xml           |   3 +-
 .../YARN/configuration/capacity-scheduler.xml   |   9 +-
 .../services/YARN/configuration/yarn-site.xml   |   9 +-
 .../services/HBASE/configuration/hbase-site.xml |   6 +-
 .../ranger-hbase-plugin-properties.xml          |  78 +++-----
 .../ranger-hdfs-plugin-properties.xml           |  75 +++-----
 .../services/HIVE/configuration/hive-site.xml   |   6 +-
 .../ranger-hive-plugin-properties.xml           |  78 +++-----
 .../ranger-knox-plugin-properties.xml           |  75 +++-----
 .../YARN/configuration/capacity-scheduler.xml   |   3 +-
 .../services/YARN/configuration/yarn-site.xml   |   3 +-
 .../configuration/application-properties.xml    |  18 +-
 .../HBASE/configuration/ranger-hbase-audit.xml  |  21 +--
 .../HDFS/configuration/ranger-hdfs-audit.xml    |  21 +--
 .../HIVE/configuration/ranger-hive-audit.xml    |  21 +--
 .../KAFKA/configuration/ranger-kafka-audit.xml  |  21 +--
 .../KNOX/configuration/ranger-knox-audit.xml    |  21 +--
 .../configuration/ranger-kms-audit.xml          |  21 +--
 .../YARN/configuration/capacity-scheduler.xml   |   3 +-
 .../YARN/configuration/ranger-yarn-audit.xml    |  21 +--
 .../AMBARI_METRICS/configuration/ams-env.xml    |   3 +-
 .../configuration/ams-hbase-env.xml             |   3 +-
 .../FALCON/configuration/falcon-env.xml         |   3 +-
 .../services/HBASE/configuration/hbase-env.xml  |   3 +-
 .../services/HBASE/configuration/hbase-site.xml |   3 +-
 .../services/HDFS/configuration/hadoop-env.xml  |   6 +-
 .../services/HDFS/configuration/hdfs-site.xml   |   9 +-
 .../services/HIVE/configuration/hive-env.xml    |   9 +-
 .../services/OOZIE/configuration/oozie-env.xml  |   3 +-
 .../services/SQOOP/configuration/sqoop-env.xml  |   3 +-
 .../services/STORM/configuration/storm-env.xml  |   3 +-
 .../2.1/services/TEZ/configuration/tez-env.xml  |   3 +-
 .../YARN/configuration-mapred/mapred-env.xml    |   3 +-
 .../services/YARN/configuration/yarn-env.xml    |   3 +-
 .../ZOOKEEPER/configuration/zookeeper-env.xml   |   3 +-
 .../services/HBASE/configuration/hbase-site.xml |   3 +-
 .../services/HIVE/configuration/hive-env.xml    |   3 +-
 .../services/HIVE/configuration/hive-site.xml   |  18 +-
 .../services/KNOX/configuration/knox-env.xml    |   9 +-
 .../YARN/configuration-mapred/mapred-site.xml   |  15 +-
 .../services/HBASE/configuration/hbase-site.xml |   6 +-
 .../services/OOZIE/configuration/oozie-env.xml  |   3 +-
 .../services/OOZIE/configuration/oozie-site.xml |   3 +-
 .../services/STORM/configuration/storm-site.xml |   3 +-
 .../YARN/configuration/capacity-scheduler.xml   |   9 +-
 .../upgrade/AbstractUpgradeCatalogTest.java     | 188 +++++++++++++++++++
 .../YARN/configuration/capacity-scheduler.xml   |   4 +-
 .../services/YARN/configuration/yarn-site.xml   |   6 +-
 .../services/YARN/configuration/yarn-site.xml   |   6 +-
 .../services/YARN/configuration/yarn-site.xml   |   6 +-
 .../services/HDFS/configuration/hdfs-site.xml   |   1 -
 .../services/HDFS/configuration/hdfs-site.xml   |   1 -
 .../services/HDFS/configuration/hdfs-site.xml   |   1 -
 98 files changed, 648 insertions(+), 831 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/ambari-server/src/main/java/org/apache/ambari/server/stack/ConfigurationModule.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/ConfigurationModule.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/ConfigurationModule.java
index de5147d..9c4e9d1 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/stack/ConfigurationModule.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/ConfigurationModule.java
@@ -149,7 +149,7 @@ public class ConfigurationModule extends BaseModule<ConfigurationModule, Configu
     while (iter.hasNext()) {
       PropertyInfo prop = iter.next();
       existingProps.add(prop.getFilename() + "/" + prop.getName());
-      if (prop.isDeleted()) {
+      if (prop.getPropertyAmbariUpgradeBehavior().isDelete()) {
         iter.remove();
       }
     }

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/ambari-server/src/main/java/org/apache/ambari/server/state/PropertyInfo.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/PropertyInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/state/PropertyInfo.java
index c570ab3..167fefa 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/PropertyInfo.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/PropertyInfo.java
@@ -48,7 +48,6 @@ public class PropertyInfo {
   private String displayName;
 
   private String filename;
-  private boolean deleted;
 
   @XmlElement(name="on-ambari-upgrade", required = true)
   private PropertyUpgradeBehavior propertyAmbariUpgradeBehavior;
@@ -86,9 +85,6 @@ public class PropertyInfo {
 
   public PropertyInfo() {
     propertyAmbariUpgradeBehavior = new PropertyUpgradeBehavior();
-    propertyAmbariUpgradeBehavior.setAdd(true);
-    propertyAmbariUpgradeBehavior.setUpdate(false);
-    propertyAmbariUpgradeBehavior.setDelete(false);
   }
 
   public String getName() {
@@ -154,14 +150,6 @@ public class PropertyInfo {
       getDependsOnProperties());
   }
 
-  public boolean isDeleted() {
-    return deleted;
-  }
-
-  public void setDeleted(boolean deleted) {
-    this.deleted = deleted;
-  }
-
   public Map<String, String> getAttributesMap() {
     Map<String, String> attributes = new HashMap<String, String>();
     for (Element propertyAttribute : propertyAttributes) {
@@ -241,7 +229,6 @@ public class PropertyInfo {
       ", value='" + value + '\'' +
       ", description='" + description + '\'' +
       ", filename='" + filename + '\'' +
-      ", deleted=" + deleted +
       ", requireInput=" + requireInput +
       ", propertyTypes=" + propertyTypes +
       ", propertyAttributes=" + propertyAttributes +
@@ -257,7 +244,6 @@ public class PropertyInfo {
     GROUP,
     TEXT,
     ADDITIONAL_USER_PROPERTY,
-    DONT_ADD_ON_UPGRADE,
     NOT_MANAGED_HDFS_PATH,
     VALUE_FROM_PROPERTY_FILE
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/ambari-server/src/main/java/org/apache/ambari/server/state/PropertyUpgradeBehavior.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/PropertyUpgradeBehavior.java b/ambari-server/src/main/java/org/apache/ambari/server/state/PropertyUpgradeBehavior.java
index f6791ee..2afed03 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/PropertyUpgradeBehavior.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/PropertyUpgradeBehavior.java
@@ -22,19 +22,31 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 
 /**
- * Represents a behavior used during upgrade for property
+ * Represents a behavior used during ambari upgrade for property
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 public class PropertyUpgradeBehavior {
 
-  @XmlAttribute(name="add", required = true)
-  private boolean add;
+  /**
+   * If true, add property during ambari-upgrade. If config type does
+   * not exist, it will be created only if there are properties that
+   * are going to be added
+   */
+  @XmlAttribute(name="add", required = false)
+  private boolean add = true;
 
-  @XmlAttribute(name="delete", required = true)
-  private boolean delete;
+  /**
+   * If true, then remove this property during ambari-upgrade
+   */
+  @XmlAttribute(name="delete", required = false)
+  private boolean delete = false;
 
-  @XmlAttribute(name="update", required = true)
-  private boolean update;
+  /**
+   * If true, during ambari upgrade property value will be blindly overwritten
+   * with default value
+   */
+  @XmlAttribute(name="update", required = false)
+  private boolean update = false;
 
   public PropertyUpgradeBehavior() {}
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
index 3ee8bba..f185346 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
@@ -50,6 +50,7 @@ import org.apache.ambari.server.state.Clusters;
 import org.apache.ambari.server.state.Config;
 import org.apache.ambari.server.state.ConfigHelper;
 import org.apache.ambari.server.state.PropertyInfo;
+import org.apache.ambari.server.state.PropertyUpgradeBehavior;
 import org.apache.ambari.server.state.ServiceInfo;
 import org.apache.ambari.server.state.StackId;
 import org.apache.ambari.server.state.kerberos.AbstractKerberosDescriptorContainer;
@@ -309,40 +310,60 @@ public abstract class AbstractUpgradeCatalog implements UpgradeCatalog {
 
     if (clusterMap != null && !clusterMap.isEmpty()) {
       for (Cluster cluster : clusterMap.values()) {
-        Map<String, Set<String>> newProperties = new HashMap<String, Set<String>>();
+        Map<String, Set<String>> toAddProperties = new HashMap<String, Set<String>>();
+        Map<String, Set<String>> toUpdateProperties = new HashMap<String, Set<String>>();
+        Map<String, Set<String>> toRemoveProperties = new HashMap<String, Set<String>>();
+
 
         Set<PropertyInfo> stackProperties = configHelper.getStackProperties(cluster);
         for(String serviceName: cluster.getServices().keySet()) {
           Set<PropertyInfo> properties = configHelper.getServiceProperties(cluster, serviceName);
 
-          if(properties == null) {
+          if (properties == null) {
             continue;
           }
           properties.addAll(stackProperties);
 
-          for(PropertyInfo property:properties) {
+          for (PropertyInfo property : properties) {
             String configType = ConfigHelper.fileNameToConfigType(property.getFilename());
             Config clusterConfigs = cluster.getDesiredConfigByType(configType);
-            if(clusterConfigs == null || !clusterConfigs.getProperties().containsKey(property.getName())) {
-              if (property.getValue() == null || property.getPropertyTypes().contains(PropertyInfo.PropertyType.DONT_ADD_ON_UPGRADE)) {
-                continue;
-              }
+              PropertyUpgradeBehavior upgradeBehavior = property.getPropertyAmbariUpgradeBehavior();
 
-              LOG.info("Config " + property.getName() + " from " + configType + " from xml configurations" +
-                  " is not found on the cluster. Adding it...");
-
-              if(!newProperties.containsKey(configType)) {
-                newProperties.put(configType, new HashSet<String>());
+              if (upgradeBehavior.isAdd()) {
+                if(!toAddProperties.containsKey(configType)) {
+                  toAddProperties.put(configType, new HashSet<String>());
+                }
+                toAddProperties.get(configType).add(property.getName());
               }
-              newProperties.get(configType).add(property.getName());
-            }
+              if (upgradeBehavior.isUpdate()) {
+                if(!toUpdateProperties.containsKey(configType)) {
+                  toUpdateProperties.put(configType, new HashSet<String>());
+                }
+                toUpdateProperties.get(configType).add(property.getName());
+              }
+              if (upgradeBehavior.isDelete()) {
+                if(!toRemoveProperties.containsKey(configType)) {
+                  toRemoveProperties.put(configType, new HashSet<String>());
+                }
+                toRemoveProperties.get(configType).add(property.getName());
+              }
+
           }
         }
 
+        for (Entry<String, Set<String>> newProperty : toAddProperties.entrySet()) {
+          String newPropertyKey = newProperty.getKey();
+          updateConfigurationPropertiesWithValuesFromXml(newPropertyKey, newProperty.getValue(), false, true);
+        }
 
+        for (Entry<String, Set<String>> newProperty : toUpdateProperties.entrySet()) {
+          String newPropertyKey = newProperty.getKey();
+          updateConfigurationPropertiesWithValuesFromXml(newPropertyKey, newProperty.getValue(), true, false);
+        }
 
-        for (Entry<String, Set<String>> newProperty : newProperties.entrySet()) {
-          updateConfigurationPropertiesWithValuesFromXml(newProperty.getKey(), newProperty.getValue(), false, true);
+        for (Entry<String, Set<String>> toRemove : toRemoveProperties.entrySet()) {
+          String newPropertyKey = toRemove.getKey();
+          updateConfigurationPropertiesWithValuesFromXml(newPropertyKey, Collections.<String>emptySet(), toRemove.getValue(), false, true);
         }
       }
     }
@@ -388,6 +409,15 @@ public abstract class AbstractUpgradeCatalog implements UpgradeCatalog {
    */
   protected void updateConfigurationPropertiesWithValuesFromXml(String configType,
       Set<String> propertyNames, boolean updateIfExists, boolean createNewConfigType) throws AmbariException {
+    updateConfigurationPropertiesWithValuesFromXml(configType, propertyNames, null, updateIfExists, createNewConfigType);
+
+  }
+
+  protected void updateConfigurationPropertiesWithValuesFromXml(String configType,
+                                                                Set<String> propertyNames,
+                                                                Set<String> toRemove,
+                                                                boolean updateIfExists,
+                                                                boolean createNewConfigType) throws AmbariException {
     ConfigHelper configHelper = injector.getInstance(ConfigHelper.class);
     AmbariManagementController controller = injector.getInstance(AmbariManagementController.class);
 
@@ -421,7 +451,7 @@ public abstract class AbstractUpgradeCatalog implements UpgradeCatalog {
         }
 
         updateConfigurationPropertiesForCluster(cluster, configType,
-            properties, updateIfExists, createNewConfigType);
+            properties, toRemove, updateIfExists, createNewConfigType);
       }
     }
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/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 6793e4e..a7e7f92 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
@@ -22,23 +22,21 @@
   <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>
     </value-attributes>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <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>
       <overridable>false</overridable>
     </value-attributes>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>instance.zookeeper.timeout</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/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 fd68ae0..25df1c5 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
@@ -119,9 +119,8 @@
   <property>
     <name>atlas.server.bind.address</name>
     <value>localhost</value>
-    <property-type>DONT_ADD_ON_UPGRADE</property-type>
     <description/>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>atlas.http.authentication.enabled</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/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 aacf10a..f8681db 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
@@ -137,9 +137,8 @@
   <property>
     <name>*.broker.url</name>
     <value>tcp://localhost:61616</value>
-    <property-type>DONT_ADD_ON_UPGRADE</property-type>
     <description>Default Active MQ url</description>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>*.broker.ttlInMins</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/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 4e56084..54ab35d 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,7 +23,6 @@
   <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
@@ -33,7 +32,7 @@
     into /tmp.  Change this configuration else all data will be lost
     on machine restart.
     </description>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>hbase.cluster.distributed</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/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 7f67b8a..5c6f043 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
@@ -53,11 +53,10 @@
     <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>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>fs.trash.interval</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/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 274163e..22ab02a 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
@@ -248,18 +248,16 @@
   <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>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>dfs.namenode.rpc-address</name>
     <value>localhost:8020</value>
-    <property-type>DONT_ADD_ON_UPGRADE</property-type>
     <description>RPC address that handles all clients requests.</description>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>dfs.datanode.du.reserved</name>
@@ -359,16 +357,14 @@
     <!-- 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>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <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>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>dfs.datanode.data.dir.perm</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/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 b0f36e7..61437d5 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
@@ -43,7 +43,6 @@ 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>
@@ -59,7 +58,7 @@ limitations under the License.
         <type>hive-site</type>
       </property>
     </depends-on>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>javax.jdo.option.ConnectionDriverName</name>
@@ -123,9 +122,8 @@ 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>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>hive.metastore.pre.event.listeners</name>
@@ -438,7 +436,6 @@ limitations under the License.
   </property>
   <property>
     <name>atlas.cluster.name</name>
-    <property-type>DONT_ADD_ON_UPGRADE</property-type>
     <value>{{cluster_name}}</value>
     <depends-on>
       <property>
@@ -446,12 +443,11 @@ limitations under the License.
         <name>atlas.enableTLS</name>
       </property>
     </depends-on>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <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>
@@ -466,6 +462,6 @@ limitations under the License.
         <name>atlas.server.https.port</name>
       </property>
     </depends-on>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/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 444b8b4..eaa5334 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
@@ -113,12 +113,11 @@ 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>
     </value-attributes>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>templeton.storage.class</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/configuration/kafka-broker.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/configuration/kafka-broker.xml b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/configuration/kafka-broker.xml
index cfdd989..f7da62c 100644
--- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/configuration/kafka-broker.xml
+++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/configuration/kafka-broker.xml
@@ -46,7 +46,6 @@
   <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
@@ -54,7 +53,7 @@
       path /chroot/path. Note that you must create this path yourself prior to starting the broker and consumers must use the
       same connection string.
     </description>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>message.max.bytes</name>
@@ -336,9 +335,8 @@
   <property>
     <name>kafka.ganglia.metrics.host</name>
     <value>localhost</value>
-    <property-type>DONT_ADD_ON_UPGRADE</property-type>
     <description> Ganglia host </description>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>kafka.ganglia.metrics.port</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/kafka-broker.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/kafka-broker.xml b/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/kafka-broker.xml
index 7f474f6..8c586a7 100644
--- a/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/kafka-broker.xml
+++ b/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/kafka-broker.xml
@@ -21,9 +21,8 @@
   <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 connections. localhost will be substituted with hostname.</description>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>controlled.shutdown.enable</name>
@@ -141,8 +140,7 @@
     <name>port</name>
     <value>6667</value>
     <description>Deprecated config in favor of listeners config.</description>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>external.kafka.metrics.exclude.prefix</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-plugin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-plugin-properties.xml b/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-plugin-properties.xml
index f3a6bcf..74cdf63 100644
--- a/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-plugin-properties.xml
+++ b/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-plugin-properties.xml
@@ -47,9 +47,8 @@
   <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>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>ranger-kafka-plugin-enabled</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/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 47c900e..f0f6f41 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
@@ -112,7 +112,6 @@
   <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/>
     <depends-on>
       <property>
@@ -120,7 +119,7 @@
         <name>xasecure.audit.destination.hdfs.dir</name>
       </property>
     </depends-on>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>XAAUDIT.HDFS.LOCAL_BUFFER_DIRECTORY</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/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 a309fa4..6d02b95 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
@@ -24,9 +24,8 @@
   <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>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>oozie.system.id</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/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 2d0047c..12b2121 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
@@ -34,9 +34,8 @@
   <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>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>oozie.credentials.credentialclasses</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/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 5082277..3187971 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
@@ -277,7 +277,6 @@
   <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>
@@ -286,7 +285,7 @@
         <name>fs.defaultFS</name>
       </property>
     </depends-on>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>xasecure.audit.destination.db</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/admin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/admin-properties.xml b/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/admin-properties.xml
index 121a797..7100389 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/admin-properties.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/admin-properties.xml
@@ -80,67 +80,54 @@
   </property>
   <property>
     <name>policymgr_http_enabled</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>authentication_method</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>remoteLoginEnabled</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>authServiceHostName</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>authServicePort</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>xa_ldap_url</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>xa_ldap_userDNpattern</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>xa_ldap_groupSearchBase</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>xa_ldap_groupSearchFilter</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>xa_ldap_groupRoleAttribute</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>xa_ldap_ad_domain</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>xa_ldap_ad_url</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>SQL_COMMAND_INVOKER</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/ranger-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/ranger-env.xml b/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/ranger-env.xml
index ae56f8b..d281569 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/ranger-env.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/ranger-env.xml
@@ -49,15 +49,13 @@
   </property>
   <property>
     <name>oracle_home</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>ranger_privelege_user_jdbc_url</name>
     <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>
@@ -71,7 +69,7 @@
         <name>db_host</name>
       </property>
     </depends-on>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>ranger-yarn-plugin-enabled</name>
@@ -187,7 +185,6 @@
   <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>
@@ -196,7 +193,7 @@
         <name>fs.defaultFS</name>
       </property>
     </depends-on>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>xasecure.audit.destination.db</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/ranger-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/ranger-site.xml b/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/ranger-site.xml
index 4317cfa..6519296 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/ranger-site.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/ranger-site.xml
@@ -22,37 +22,30 @@
 <configuration supports_final="false" supports_do_not_extend="true">
   <property>
     <name>http.service.port</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>https.service.port</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>https.attrib.keystoreFile</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>https.attrib.keystorePass</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>https.attrib.keyAlias</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>https.attrib.clientAuth</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>http.enabled</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/usersync-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/usersync-properties.xml b/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/usersync-properties.xml
index 7eb78e5..ca7fe2f 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/usersync-properties.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.5.0/configuration/usersync-properties.xml
@@ -22,87 +22,70 @@
 <configuration supports_final="false" supports_do_not_extend="true">
   <property>
     <name>SYNC_SOURCE</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>MIN_UNIX_USER_ID_TO_SYNC</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>POLICY_MGR_URL</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>SYNC_INTERVAL</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>SYNC_LDAP_URL</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>SYNC_LDAP_BIND_DN</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>SYNC_LDAP_BIND_PASSWORD</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>CRED_KEYSTORE_FILENAME</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>SYNC_LDAP_USER_SEARCH_BASE</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>SYNC_LDAP_USER_SEARCH_SCOPE</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>SYNC_LDAP_USER_OBJECT_CLASS</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>SYNC_LDAP_USER_SEARCH_FILTER</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>SYNC_LDAP_USER_NAME_ATTRIBUTE</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>SYNC_LDAP_USER_GROUP_NAME_ATTRIBUTE</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>SYNC_LDAP_USERNAME_CASE_CONVERSION</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>SYNC_LDAP_GROUPNAME_CASE_CONVERSION</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>logdir</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/admin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/admin-properties.xml b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/admin-properties.xml
index a747dde..57052b8 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/admin-properties.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/admin-properties.xml
@@ -22,17 +22,14 @@
 <configuration>
   <property>
     <name>audit_db_name</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>audit_db_user</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>audit_db_password</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-admin-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-admin-site.xml b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-admin-site.xml
index 2ba3794..be59cc8 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-admin-site.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-admin-site.xml
@@ -18,33 +18,27 @@
 <configuration>
   <property>
     <name>ranger.jpa.audit.jdbc.driver</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>ranger.jpa.audit.jdbc.url</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>ranger.jpa.audit.jdbc.user</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>ranger.jpa.audit.jdbc.password</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>ranger.jpa.audit.jdbc.credential.alias</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>ranger.jpa.audit.jdbc.dialect</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>ranger.admin.kerberos.token.valid.seconds</name>
@@ -154,13 +148,11 @@
   </property>
   <property>
     <name>ranger.sso.cookiename</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>ranger.sso.query.param.originalurl</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>ranger.ldap.ad.user.searchfilter</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-env.xml b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-env.xml
index b1fc537..eff0cd2 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-env.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-env.xml
@@ -22,7 +22,6 @@
 <configuration>
   <property>
     <name>xasecure.audit.destination.db</name>
-    <deleted>true</deleted>
     <on-ambari-upgrade delete="true"/>
   </property>
   <property>
@@ -62,4 +61,4 @@
     </value-attributes>
     <on-ambari-upgrade add="true"/>
   </property>
-</configuration>
\ No newline at end of file
+</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/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 9870b8b..1bce4e6 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
@@ -22,9 +22,8 @@
   <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>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>hadoop.security.keystore.JavaKeyStoreProvider.password</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/ambari-server/src/main/resources/common-services/SPARK/1.6.0/configuration/spark-defaults.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.6.0/configuration/spark-defaults.xml b/ambari-server/src/main/resources/common-services/SPARK/1.6.0/configuration/spark-defaults.xml
index 633cbda..082cdde 100644
--- a/ambari-server/src/main/resources/common-services/SPARK/1.6.0/configuration/spark-defaults.xml
+++ b/ambari-server/src/main/resources/common-services/SPARK/1.6.0/configuration/spark-defaults.xml
@@ -21,8 +21,7 @@
 <configuration supports_final="true">
   <property>
     <name>spark.yarn.services</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>spark.history.provider</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/ambari-server/src/main/resources/common-services/SPARK/1.6.0/configuration/spark-thrift-sparkconf.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.6.0/configuration/spark-thrift-sparkconf.xml b/ambari-server/src/main/resources/common-services/SPARK/1.6.0/configuration/spark-thrift-sparkconf.xml
index daacdee..eda0fce 100644
--- a/ambari-server/src/main/resources/common-services/SPARK/1.6.0/configuration/spark-thrift-sparkconf.xml
+++ b/ambari-server/src/main/resources/common-services/SPARK/1.6.0/configuration/spark-thrift-sparkconf.xml
@@ -21,48 +21,39 @@
 <configuration supports_final="true">
   <property>
     <name>spark.yarn.executor.memoryOverhead</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>spark.yarn.driver.memoryOverhead</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>spark.yarn.scheduler.heartbeat.interval-ms</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>spark.yarn.max.executor.failures</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>spark.yarn.containerLauncherMaxThreads</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>spark.yarn.submit.file.replication</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>spark.yarn.preserve.staging.files</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>spark.yarn.max.executor.failures</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>spark.yarn.services</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>spark.history.provider</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/ranger-storm-plugin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/ranger-storm-plugin-properties.xml b/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/ranger-storm-plugin-properties.xml
index 21cd096..c19d5ec 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/ranger-storm-plugin-properties.xml
+++ b/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/ranger-storm-plugin-properties.xml
@@ -21,127 +21,102 @@
 <configuration supports_final="true">
   <property>
     <name>XAAUDIT.DB.IS_ENABLED</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>XAAUDIT.HDFS.IS_ENABLED</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>XAAUDIT.HDFS.DESTINATION_DIRECTORY</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>XAAUDIT.HDFS.LOCAL_BUFFER_DIRECTORY</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>XAAUDIT.HDFS.LOCAL_ARCHIVE_DIRECTORY</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>XAAUDIT.HDFS.DESTINTATION_FILE</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>XAAUDIT.HDFS.DESTINTATION_FLUSH_INTERVAL_SECONDS</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>XAAUDIT.HDFS.DESTINTATION_ROLLOVER_INTERVAL_SECONDS</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>XAAUDIT.HDFS.DESTINTATION_OPEN_RETRY_INTERVAL_SECONDS</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>XAAUDIT.HDFS.LOCAL_BUFFER_FILE</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>XAAUDIT.HDFS.LOCAL_BUFFER_FLUSH_INTERVAL_SECONDS</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>XAAUDIT.HDFS.LOCAL_BUFFER_ROLLOVER_INTERVAL_SECONDS</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>XAAUDIT.HDFS.LOCAL_ARCHIVE_MAX_FILE_COUNT</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>SSL_KEYSTORE_FILE_PATH</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>SSL_KEYSTORE_PASSWORD</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>SSL_TRUSTSTORE_FILE_PATH</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>SSL_TRUSTSTORE_PASSWORD</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>POLICY_MGR_URL</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>SQL_CONNECTOR_JAR</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>XAAUDIT.DB.FLAVOUR</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>XAAUDIT.DB.DATABASE_NAME</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>XAAUDIT.DB.USER_NAME</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>XAAUDIT.DB.PASSWORD</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>XAAUDIT.DB.HOSTNAME</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>REPOSITORY_NAME</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/storm-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/storm-site.xml b/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/storm-site.xml
index a8f1584..b0f194a 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/storm-site.xml
+++ b/ambari-server/src/main/resources/common-services/STORM/0.10.0/configuration/storm-site.xml
@@ -21,14 +21,13 @@
   <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>
       <editable-only-at-install>true</editable-only-at-install>
       <overridable>false</overridable>
     </value-attributes>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>topology.min.replication.count.default</name>
@@ -57,9 +56,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>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="false"/>
   </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/ambari-server/src/main/resources/common-services/STORM/0.9.1/configuration/storm-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1/configuration/storm-site.xml b/ambari-server/src/main/resources/common-services/STORM/0.9.1/configuration/storm-site.xml
index d7c87e9..157fb5c 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1/configuration/storm-site.xml
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1/configuration/storm-site.xml
@@ -43,13 +43,12 @@
   <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>
       <overridable>false</overridable>
     </value-attributes>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>storm.zookeeper.port</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/ambari-server/src/main/resources/common-services/STORM/0.9.3/configuration/ranger-storm-plugin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.3/configuration/ranger-storm-plugin-properties.xml b/ambari-server/src/main/resources/common-services/STORM/0.9.3/configuration/ranger-storm-plugin-properties.xml
index 7aa18cc..2fee04f 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.3/configuration/ranger-storm-plugin-properties.xml
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.3/configuration/ranger-storm-plugin-properties.xml
@@ -105,7 +105,6 @@
   <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/>
     <depends-on>
       <property>
@@ -113,7 +112,7 @@
         <name>xasecure.audit.destination.hdfs.dir</name>
       </property>
     </depends-on>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>XAAUDIT.HDFS.LOCAL_BUFFER_DIRECTORY</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/ambari-server/src/main/resources/common-services/STORM/1.0.1/configuration/ranger-storm-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/1.0.1/configuration/ranger-storm-audit.xml b/ambari-server/src/main/resources/common-services/STORM/1.0.1/configuration/ranger-storm-audit.xml
index fcaecaa..72c864d 100644
--- a/ambari-server/src/main/resources/common-services/STORM/1.0.1/configuration/ranger-storm-audit.xml
+++ b/ambari-server/src/main/resources/common-services/STORM/1.0.1/configuration/ranger-storm-audit.xml
@@ -21,37 +21,30 @@
 <configuration>
   <property>
     <name>xasecure.audit.destination.db</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>xasecure.audit.destination.db.jdbc.url</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>xasecure.audit.destination.db.user</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>xasecure.audit.destination.db.password</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>xasecure.audit.destination.db.jdbc.driver</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>xasecure.audit.credential.provider.file</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>xasecure.audit.destination.db.batch.filespool.dir</name>
-    <deleted>true</deleted>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/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 85a1eba..0d6c617 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
@@ -253,16 +253,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>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </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>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>mapreduce.framework.name</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/capacity-scheduler.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/capacity-scheduler.xml b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/capacity-scheduler.xml
index b4fedd8..912113b 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/capacity-scheduler.xml
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/capacity-scheduler.xml
@@ -22,8 +22,7 @@
     <description>
       Maximum number of applications that can be pending and running.
     </description>
-    <property-type>DONT_ADD_ON_UPGRADE</property-type>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>yarn.scheduler.capacity.maximum-am-resource-percent</name>
@@ -33,8 +32,7 @@
       application masters i.e. controls number of concurrent running
       applications.
     </description>
-    <property-type>DONT_ADD_ON_UPGRADE</property-type>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>yarn.scheduler.capacity.root.queues</name>
@@ -42,8 +40,7 @@
     <description>
       The queues at the this level (root is the root queue).
     </description>
-    <property-type>DONT_ADD_ON_UPGRADE</property-type>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>yarn.scheduler.capacity.root.capacity</name>
@@ -54,15 +51,13 @@
       The child queues capacity should add up to their parent queue's capacity
       or less.
     </description>
-    <property-type>DONT_ADD_ON_UPGRADE</property-type>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>yarn.scheduler.capacity.root.default.capacity</name>
     <value>100</value>
     <description>Default queue target capacity.</description>
-    <property-type>DONT_ADD_ON_UPGRADE</property-type>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>yarn.scheduler.capacity.root.default.user-limit-factor</name>
@@ -70,8 +65,7 @@
     <description>
       Default queue user limit a percentage from 0.0 to 1.0.
     </description>
-    <property-type>DONT_ADD_ON_UPGRADE</property-type>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>yarn.scheduler.capacity.root.default.maximum-capacity</name>
@@ -79,8 +73,7 @@
     <description>
       The maximum capacity of the default queue. 
     </description>
-    <property-type>DONT_ADD_ON_UPGRADE</property-type>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>yarn.scheduler.capacity.root.default.state</name>
@@ -88,8 +81,7 @@
     <description>
       The state of the default queue. State can be one of RUNNING or STOPPED.
     </description>
-    <property-type>DONT_ADD_ON_UPGRADE</property-type>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>yarn.scheduler.capacity.root.default.acl_submit_applications</name>
@@ -97,8 +89,7 @@
     <description>
       The ACL of who can submit jobs to the default queue.
     </description>
-    <property-type>DONT_ADD_ON_UPGRADE</property-type>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>yarn.scheduler.capacity.root.default.acl_administer_jobs</name>
@@ -106,8 +97,7 @@
     <description>
       The ACL of who can administer jobs on the default queue.
     </description>
-    <property-type>DONT_ADD_ON_UPGRADE</property-type>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>yarn.scheduler.capacity.root.acl_administer_queue</name>
@@ -116,8 +106,7 @@
       The ACL for who can administer this queue i.e. change sub-queue 
       allocations.
     </description>
-    <property-type>DONT_ADD_ON_UPGRADE</property-type>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>yarn.scheduler.capacity.node-locality-delay</name>
@@ -128,8 +117,7 @@
       Typically this should be set to number of nodes in the cluster, By default is setting
       approximately number of nodes in one rack which is 40.
     </description>
-    <property-type>DONT_ADD_ON_UPGRADE</property-type>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>yarn.scheduler.capacity.default.minimum-user-limit-percent</name>
@@ -137,7 +125,6 @@
     <description>
       Default minimum queue resource limit depends on the number of users who have submitted applications.
     </description>
-    <property-type>DONT_ADD_ON_UPGRADE</property-type>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/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 b1b30aa..bf89165 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
@@ -22,40 +22,35 @@
   <property>
     <name>yarn.resourcemanager.hostname</name>
     <value>localhost</value>
-    <property-type>DONT_ADD_ON_UPGRADE</property-type>
     <description>The hostname of the RM.</description>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </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>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </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>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </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.
     </description>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <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>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>yarn.resourcemanager.scheduler.class</name>
@@ -372,20 +367,18 @@
   <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>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <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>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>yarn.nodemanager.vmem-check-enabled</name>
@@ -398,11 +391,10 @@
   <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>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>yarn.resourcemanager.nodes.exclude-path</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/ambari-server/src/main/resources/configuration-schema.xsd
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/configuration-schema.xsd b/ambari-server/src/main/resources/configuration-schema.xsd
index 6716dd5..0e17b0e 100644
--- a/ambari-server/src/main/resources/configuration-schema.xsd
+++ b/ambari-server/src/main/resources/configuration-schema.xsd
@@ -127,7 +127,6 @@
       <xs:enumeration value="ADDITIONAL_USER_PROPERTY"/>
       <xs:enumeration value="NOT_MANAGED_HDFS_PATH"/>
       <xs:enumeration value="VALUE_FROM_PROPERTY_FILE"/>
-      <xs:enumeration value="DONT_ADD_ON_UPGRADE"/>
     </xs:restriction>
   </xs:simpleType>
 </xs:schema>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/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 8dc02c5..229f7e1 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
@@ -42,13 +42,12 @@ 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>
       <overridable>false</overridable>
     </value-attributes>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>javax.jdo.option.ConnectionDriverName</name>
@@ -120,9 +119,8 @@ 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>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>hive.metastore.client.socket.timeout</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/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 7e746c0..f84395d 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
@@ -24,9 +24,8 @@
   <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>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>oozie.system.id</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/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 463dd6b..5edfe36 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
@@ -59,30 +59,27 @@
   <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>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <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>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <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.
     </description>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <description>Enable age off of timeline store data.</description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml
index f92bc1a..56b5752 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml
@@ -31,11 +31,10 @@
   <property>
     <name>hbase.hstore.flush.retries.number</name>
     <value>120</value>
-    <deleted>true</deleted>
     <description>
     The number of times the region flush operation will be retried.
     </description>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade delete="true"/>
   </property>
   <property>
     <name>hbase.hregion.majorcompaction</name>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b48b1fe/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 ca50414..62f9e83 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
@@ -105,7 +105,6 @@
   <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/>
     <depends-on>
       <property>
@@ -113,7 +112,7 @@
         <name>xasecure.audit.destination.hdfs.dir</name>
       </property>
     </depends-on>
-    <on-ambari-upgrade add="true"/>
+    <on-ambari-upgrade add="false"/>
   </property>
   <property>
     <name>XAAUDIT.HDFS.LOCAL_BUFFER_DIRECTORY</name>


Mime
View raw message