You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2016/06/09 14:20:47 UTC
[87/94] ambari git commit: AMBARI-17112. Fixed implementation of
on-ambari-upgrade support. Update all stack configuration xmls to pass
validation (dlysnichenko)
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/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 9524e1d..bc26d8e 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
@@ -23,103 +23,86 @@
<property>
<name>SYNC_SOURCE</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>MIN_UNIX_USER_ID_TO_SYNC</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>POLICY_MGR_URL</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>SYNC_INTERVAL</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>SYNC_LDAP_URL</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>SYNC_LDAP_BIND_DN</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>SYNC_LDAP_BIND_PASSWORD</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>CRED_KEYSTORE_FILENAME</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>SYNC_LDAP_USER_SEARCH_BASE</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>SYNC_LDAP_USER_SEARCH_SCOPE</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>SYNC_LDAP_USER_OBJECT_CLASS</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>SYNC_LDAP_USER_SEARCH_FILTER</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>SYNC_LDAP_USER_NAME_ATTRIBUTE</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>SYNC_LDAP_USER_GROUP_NAME_ATTRIBUTE</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>SYNC_LDAP_USERNAME_CASE_CONVERSION</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>SYNC_LDAP_GROUPNAME_CASE_CONVERSION</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>logdir</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/admin-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/admin-log4j.xml b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/admin-log4j.xml
index 2a15750..7bf4294 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/admin-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/admin-log4j.xml
@@ -103,7 +103,6 @@ log4j.additivity.jdbc.connection=false
<type>content</type>
<show-property-name>false</show-property-name>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/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 3e026ec..60be81f 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
@@ -23,19 +23,16 @@
<property>
<name>audit_db_name</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>audit_db_user</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>audit_db_password</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/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 07170f3..cdbbb12 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
@@ -19,45 +19,38 @@
<property>
<name>ranger.jpa.audit.jdbc.driver</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.jpa.audit.jdbc.url</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.jpa.audit.jdbc.user</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.jpa.audit.jdbc.password</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.jpa.audit.jdbc.credential.alias</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.jpa.audit.jdbc.dialect</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.admin.kerberos.token.valid.seconds</name>
<value>30</value>
<description/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.admin.kerberos.cookie.domain</name>
@@ -66,15 +59,13 @@
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.admin.kerberos.cookie.path</name>
<value>/</value>
<description/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.spnego.kerberos.principal</name>
@@ -83,8 +74,7 @@
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.spnego.kerberos.keytab</name>
@@ -93,8 +83,7 @@
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.admin.kerberos.principal</name>
@@ -103,8 +92,7 @@
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.admin.kerberos.keytab</name>
@@ -113,8 +101,7 @@
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.lookup.kerberos.principal</name>
@@ -123,8 +110,7 @@
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.lookup.kerberos.keytab</name>
@@ -133,16 +119,14 @@
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.truststore.file</name>
<value>/etc/ranger/admin/conf/ranger-admin-keystore.jks</value>
<display-name>ranger.truststore.file</display-name>
<description>Ranger trust-store file-path</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.truststore.password</name>
@@ -150,8 +134,7 @@
<property-type>PASSWORD</property-type>
<display-name>ranger.truststore.password</display-name>
<description>Ranger trust-store password</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.audit.solr.zookeepers</name>
@@ -167,24 +150,18 @@
<name>is_solrCloud_enabled</name>
</property>
</depends-on>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
-
<property>
<name>ranger.sso.cookiename</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
-
<property>
<name>ranger.sso.query.param.originalurl</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
-
<property>
<name>ranger.ldap.ad.user.searchfilter</name>
<value>(sAMAccountName={0})</value>
@@ -192,10 +169,8 @@
<value-attributes>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
-
<property>
<name>ranger.ldap.user.searchfilter</name>
<display-name>User Search Filter</display-name>
@@ -204,14 +179,12 @@
<value-attributes>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
-
<property>
<name>ranger.kms.service.user.hdfs</name>
- <value></value>
- <description></description>
+ <value/>
+ <description/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -221,14 +194,12 @@
<name>hdfs_user</name>
</property>
</depends-on>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
-
<property>
<name>ranger.kms.service.user.hive</name>
- <value></value>
- <description></description>
+ <value/>
+ <description/>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
@@ -238,7 +209,6 @@
<name>hive_user</name>
</property>
</depends-on>
- <on-ambari-upgrade add="true" change="false" delete="false"/>
- <on-stack-upgrade add="true" change="false" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/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 4db7f45..5e7cd30 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
@@ -23,25 +23,21 @@
<property>
<name>xasecure.audit.destination.db</name>
<deleted>true</deleted>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger_solr_config_set</name>
<value>ranger_audits</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger_solr_collection_name</name>
<value>ranger_audits</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger_solr_shards</name>
<value>1</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-tagsync-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-tagsync-site.xml b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-tagsync-site.xml
index 848310d..d98c712 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-tagsync-site.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-tagsync-site.xml
@@ -28,8 +28,7 @@
<overridable>false</overridable>
<editable-only-at-install>true</editable-only-at-install>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.tagsync.dest.ranger.endpoint</name>
@@ -38,8 +37,7 @@
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.tagsync.source.atlas</name>
@@ -55,8 +53,7 @@
<name>atlas.server.bind.address</name>
</property>
</depends-on>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.tagsync.source.atlasrest</name>
@@ -66,8 +63,7 @@
<value-attributes>
<type>boolean</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.tagsync.source.file</name>
@@ -77,8 +73,7 @@
<value-attributes>
<type>boolean</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.tagsync.source.file.check.interval.millis</name>
@@ -88,8 +83,7 @@
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.tagsync.source.atlasrest.download.interval.millis</name>
@@ -98,15 +92,13 @@
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.tagsync.dest.ranger.ssl.config.filename</name>
<value>/etc/ranger/tagsync/conf/mytruststore.jks</value>
<description>Truststore used for tagsync, required if tagsync -> ranger admin communication is SSL enabled</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.tagsync.source.file.filename</name>
@@ -116,8 +108,7 @@
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.tagsync.keystore.filename</name>
@@ -126,8 +117,7 @@
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.tagsync.atlas.to.ranger.service.mapping</name>
@@ -136,8 +126,7 @@
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.tagsync.source.atlasrest.endpoint</name>
@@ -147,8 +136,7 @@
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.tagsync.atlas.custom.resource.mappers</name>
@@ -157,8 +145,7 @@
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.tagsync.kerberos.principal</name>
@@ -167,8 +154,7 @@
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.tagsync.kerberos.keytab</name>
@@ -177,14 +163,12 @@
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.tagsync.dest.ranger.username</name>
<value>rangertagsync</value>
<description/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-ugsync-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-ugsync-site.xml b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-ugsync-site.xml
index 8d20455..52dbf46 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-ugsync-site.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-ugsync-site.xml
@@ -23,8 +23,7 @@
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.usersync.kerberos.keytab</name>
@@ -33,29 +32,25 @@
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.usersync.policymgr.username</name>
<value>rangerusersync</value>
<description/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.usersync.policymgr.alias</name>
<value>ranger.usersync.policymgr.password</value>
<description/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.usersync.policymgr.keystore</name>
<value>/etc/ranger/usersync/conf/ugsync.jceks</value>
<description/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.usersync.group.search.first.enabled</name>
@@ -77,8 +72,7 @@
</entries>
<selection-cardinality>1</selection-cardinality>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.usersync.user.searchenabled</name>
@@ -100,7 +94,6 @@
</entries>
<selection-cardinality>1</selection-cardinality>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/tagsync-application-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/tagsync-application-properties.xml b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/tagsync-application-properties.xml
index 3f3cf97..fa83afe 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/tagsync-application-properties.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/tagsync-application-properties.xml
@@ -25,8 +25,7 @@
<display-name>Atlas Source: Kafka consumer group</display-name>
<value>ranger_entities_consumer</value>
<description/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>atlas.kafka.bootstrap.servers</name>
@@ -42,8 +41,7 @@
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>atlas.kafka.zookeeper.connect</name>
@@ -59,7 +57,6 @@
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/tagsync-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/tagsync-log4j.xml b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/tagsync-log4j.xml
index e0d56a3..445b094 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/tagsync-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/tagsync-log4j.xml
@@ -62,7 +62,6 @@ log4j.appender.console.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss} %5p %c{
<type>content</type>
<show-property-name>false</show-property-name>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/usersync-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/usersync-log4j.xml b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/usersync-log4j.xml
index 7c6a984..c4d2d99 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/usersync-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/usersync-log4j.xml
@@ -61,7 +61,6 @@ log4j.appender.console.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss} %5p %c{
<type>content</type>
<show-property-name>false</show-property-name>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/dbks-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/dbks-site.xml b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/dbks-site.xml
index a41cb2f..edce14b 100644
--- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/dbks-site.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/dbks-site.xml
@@ -23,8 +23,7 @@
<name>hadoop.kms.blacklist.DECRYPT_EEK</name>
<value>hdfs</value>
<description>Blacklist for decrypt EncryptedKey CryptoExtension operations</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.db.encrypt.key.password</name>
@@ -34,8 +33,7 @@
<type>password</type>
</value-attributes>
<description>Password used for encrypting Master Key</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.ks.jpa.jdbc.url</name>
@@ -59,15 +57,13 @@
<name>db_name</name>
</property>
</depends-on>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.ks.jpa.jdbc.user</name>
<value>{{db_user}}</value>
<description>Database username used for operation</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.ks.jpa.jdbc.password</name>
@@ -77,36 +73,31 @@
<type>password</type>
</value-attributes>
<description>Database user's password</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.ks.jpa.jdbc.credential.provider.path</name>
<value>/etc/ranger/kms/rangerkms.jceks</value>
<description>Credential provider path</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.ks.jpa.jdbc.credential.alias</name>
<value>ranger.ks.jdbc.password</value>
<description>Credential alias used for password</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.ks.masterkey.credential.alias</name>
<value>ranger.ks.masterkey.password</value>
<description>Credential alias used for masterkey</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.ks.jpa.jdbc.dialect</name>
<value>{{jdbc_dialect}}</value>
<description>Dialect used for database</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.ks.jpa.jdbc.driver</name>
@@ -122,14 +113,12 @@
<name>DB_FLAVOR</name>
</property>
</depends-on>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.ks.jdbc.sqlconnectorjar</name>
<value>{{ews_lib_jar_path}}</value>
<description>Driver used for database</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-env.xml b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-env.xml
index c0365bc..fa55547 100644
--- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-env.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-env.xml
@@ -29,8 +29,7 @@
<type>user</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>kms_group</name>
@@ -41,8 +40,7 @@
<value-attributes>
<type>user</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>kms_log_dir</name>
@@ -53,15 +51,13 @@
<overridable>false</overridable>
<editable-only-at-install>true</editable-only-at-install>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>kms_port</name>
<value>9292</value>
<description/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>create_db_user</name>
@@ -83,7 +79,6 @@
</entries>
<selection-cardinality>1</selection-cardinality>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-log4j.xml b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-log4j.xml
index f9e5505..a3612e1 100644
--- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-log4j.xml
@@ -67,7 +67,6 @@ log4j.logger.com.sun.jersey.server.wadl.generators.WadlGeneratorJAXBGrammarGener
<type>content</type>
<show-property-name>false</show-property-name>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-properties.xml b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-properties.xml
index d1ec672..a42a915 100644
--- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-properties.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-properties.xml
@@ -24,8 +24,7 @@
<display-name>Repository config username</display-name>
<value>keyadmin</value>
<description/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>REPOSITORY_CONFIG_PASSWORD</name>
@@ -36,8 +35,7 @@
<value-attributes>
<type>password</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>DB_FLAVOR</name>
@@ -71,8 +69,7 @@
</entries>
<selection-cardinality>1</selection-cardinality>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>SQL_CONNECTOR_JAR</name>
@@ -88,8 +85,7 @@
<name>DB_FLAVOR</name>
</property>
</depends-on>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>db_root_user</name>
@@ -99,8 +95,7 @@
<value-attributes>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>db_root_password</name>
@@ -112,8 +107,7 @@
<type>password</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>db_host</name>
@@ -123,8 +117,7 @@
<value-attributes>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>db_name</name>
@@ -134,8 +127,7 @@
<value-attributes>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>db_user</name>
@@ -145,8 +137,7 @@
<value-attributes>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>db_password</name>
@@ -158,8 +149,7 @@
<type>password</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>KMS_MASTER_KEY_PASSWD</name>
@@ -171,7 +161,6 @@
<type>password</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/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 ac3fa46..629d074 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
@@ -24,67 +24,58 @@
<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="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hadoop.security.keystore.JavaKeyStoreProvider.password</name>
<value>none</value>
<description>If using the JavaKeyStoreProvider, the password for the keystore file.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hadoop.kms.cache.enable</name>
<value>true</value>
<description>Whether the KMS will act as a cache for the backing KeyProvider. When the cache is enabled, operations like getKeyVersion, getMetadata, and getCurrentKey will sometimes return cached data without consulting the backing KeyProvider. Cached values are flushed when keys are deleted or modified.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hadoop.kms.cache.timeout.ms</name>
<value>600000</value>
<description>Expiry time for the KMS key version and key metadata cache, in milliseconds. This affects getKeyVersion and getMetadata.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hadoop.kms.current.key.cache.timeout.ms</name>
<value>30000</value>
<description>Expiry time for the KMS current key cache, in milliseconds. This affects getCurrentKey operations.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hadoop.kms.audit.aggregation.window.ms</name>
<value>10000</value>
<description>Duplicate audit log events within the aggregation window (specified in ms) are quashed to reduce log traffic. A single message for aggregated events is printed at the end of the window, along with a count of the number of aggregated events.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hadoop.kms.authentication.type</name>
<value>simple</value>
<description>Authentication type for the KMS. Can be either "simple" or "kerberos".
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hadoop.kms.authentication.kerberos.keytab</name>
<value>${user.home}/kms.keytab</value>
<description>Path to the keytab with credentials for the configured Kerberos principal.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hadoop.kms.authentication.kerberos.principal</name>
<value>HTTP/localhost</value>
<description>The Kerberos principal to use for the HTTP endpoint. The principal must start with 'HTTP/' as per the Kerberos HTTP SPNEGO specification.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hadoop.kms.authentication.kerberos.name.rules</name>
@@ -93,57 +84,49 @@
<value-attributes>
<type>multiLine</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hadoop.kms.authentication.signer.secret.provider</name>
<value>random</value>
<description>Indicates how the secret to sign the authentication cookies will be stored. Options are 'random' (default), 'string' and 'zookeeper'. If using a setup with multiple KMS instances, 'zookeeper' should be used.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hadoop.kms.authentication.signer.secret.provider.zookeeper.path</name>
<value>/hadoop-kms/hadoop-auth-signature-secret</value>
<description>The Zookeeper ZNode path where the KMS instances will store and retrieve the secret from.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hadoop.kms.authentication.signer.secret.provider.zookeeper.connection.string</name>
<value>#HOSTNAME#:#PORT#,...</value>
<description>The Zookeeper connection string, a list of hostnames and port comma separated.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hadoop.kms.authentication.signer.secret.provider.zookeeper.auth.type</name>
<value>kerberos</value>
<description>The Zookeeper authentication type, 'none' or 'sasl' (Kerberos).</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hadoop.kms.authentication.signer.secret.provider.zookeeper.kerberos.keytab</name>
<value>/etc/hadoop/conf/kms.keytab</value>
<description>The absolute path for the Kerberos keytab with the credentials to connect to Zookeeper.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hadoop.kms.authentication.signer.secret.provider.zookeeper.kerberos.principal</name>
<value>kms/#HOSTNAME#</value>
<description>The Kerberos service principal used to connect to Zookeeper.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>hadoop.kms.security.authorization.manager</name>
<value>org.apache.ranger.authorization.kms.authorizer.RangerKmsAuthorizer</value>
<description/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-audit.xml b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-audit.xml
index d51340c..f16571f 100644
--- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-audit.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-audit.xml
@@ -23,8 +23,7 @@
<name>xasecure.audit.is.enabled</name>
<value>true</value>
<description>Is Audit enabled?</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.db</name>
@@ -34,22 +33,19 @@
<value-attributes>
<type>boolean</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.db.jdbc.url</name>
<value>{{audit_jdbc_url}}</value>
<description>Audit DB JDBC URL</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.db.user</name>
<value>{{xa_audit_db_user}}</value>
<description>Audit DB JDBC User</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.db.password</name>
@@ -59,29 +55,25 @@
<type>password</type>
</value-attributes>
<description>Audit DB JDBC Password</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.db.jdbc.driver</name>
<value>{{jdbc_driver}}</value>
<description>Audit DB JDBC Driver</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.credential.provider.file</name>
<value>jceks://file{{credential_file}}</value>
<description>Credential file store</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.db.batch.filespool.dir</name>
<value>/var/log/ranger/kms/audit/db/spool</value>
<description>/var/log/ranger/kms/audit/db/spool</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.hdfs</name>
@@ -97,8 +89,7 @@
<name>fs.defaultFS</name>
</property>
</depends-on>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.hdfs.dir</name>
@@ -110,15 +101,13 @@
<name>fs.defaultFS</name>
</property>
</depends-on>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.hdfs.batch.filespool.dir</name>
<value>/var/log/ranger/kms/audit/hdfs/spool</value>
<description>/var/log/ranger/kms/audit/hdfs/spool</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.solr</name>
@@ -128,29 +117,25 @@
<value-attributes>
<type>boolean</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.solr.urls</name>
<value>{{ranger_audit_solr_urls}}</value>
<description>Solr URL</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.solr.zookeepers</name>
<value>none</value>
<description>Solr Zookeeper string</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.solr.batch.filespool.dir</name>
<value>/var/log/ranger/kms/audit/solr/spool</value>
<description>/var/log/ranger/kms/audit/solr/spool</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.provider.summary.enabled</name>
@@ -160,7 +145,6 @@
<value-attributes>
<type>boolean</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-policymgr-ssl.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-policymgr-ssl.xml b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-policymgr-ssl.xml
index c069444..ea96695 100644
--- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-policymgr-ssl.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-policymgr-ssl.xml
@@ -23,8 +23,7 @@
<name>xasecure.policymgr.clientssl.keystore</name>
<value>/etc/ranger/kms/ranger-plugin-keystore.jks</value>
<description>Java Keystore files</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.policymgr.clientssl.keystore.password</name>
@@ -34,15 +33,13 @@
<type>password</type>
</value-attributes>
<description>password for keystore</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.policymgr.clientssl.truststore</name>
<value>/etc/ranger/kms/ranger-plugin-truststore.jks</value>
<description>java truststore file</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.policymgr.clientssl.truststore.password</name>
@@ -52,21 +49,18 @@
<type>password</type>
</value-attributes>
<description>java truststore password</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.policymgr.clientssl.keystore.credential.file</name>
<value>jceks://file{{credential_file}}</value>
<description>java keystore credential file</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xasecure.policymgr.clientssl.truststore.credential.file</name>
<value>jceks://file{{credential_file}}</value>
<description>java truststore credential file</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-security.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-security.xml b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-security.xml
index 943082d..037c817 100644
--- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-security.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-security.xml
@@ -23,42 +23,36 @@
<name>ranger.plugin.kms.service.name</name>
<value>{{repo_name}}</value>
<description>Name of the Ranger service containing policies for this kms instance</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.plugin.kms.policy.source.impl</name>
<value>org.apache.ranger.admin.client.RangerAdminRESTClient</value>
<description>Class to retrieve policies from the source</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.plugin.kms.policy.rest.url</name>
<value>{{policymgr_mgr_url}}</value>
<description>URL to Ranger Admin</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.plugin.kms.policy.rest.ssl.config.file</name>
<value>/etc/ranger/kms/conf/ranger-policymgr-ssl.xml</value>
<description>Path to the file containing SSL details to contact Ranger Admin</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.plugin.kms.policy.pollIntervalMs</name>
<value>30000</value>
<description>How often to poll for changes in policies?</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.plugin.kms.policy.cache.dir</name>
<value>/etc/ranger/{{repo_name}}/policycache</value>
<description>Directory where Ranger policies are cached after successful retrieval from the source</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-site.xml b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-site.xml
index 7507c53..5bffe84 100644
--- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-site.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-site.xml
@@ -22,44 +22,37 @@
<property>
<name>ranger.service.host</name>
<value>{{kms_host}}</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.service.http.port</name>
<value>{{kms_port}}</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.service.https.port</name>
<value>9393</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.service.shutdown.port</name>
<value>7085</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.contextName</name>
<value>/kms</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>xa.webapp.dir</name>
<value>./webapp</value>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>ranger.service.https.attrib.ssl.enabled</name>
<value>false</value>
<description/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/configuration/slider-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/configuration/slider-env.xml b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/configuration/slider-env.xml
index 0824e75..f7fcdaf 100644
--- a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/configuration/slider-env.xml
+++ b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/configuration/slider-env.xml
@@ -41,7 +41,6 @@ export HADOOP_CONF_DIR={{hadoop_conf_dir}}
<value-attributes>
<type>content</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/configuration/slider-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/configuration/slider-log4j.xml b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/configuration/slider-log4j.xml
index cb7ecd0..b62a32e 100644
--- a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/configuration/slider-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/configuration/slider-log4j.xml
@@ -87,7 +87,6 @@ log4j.logger.org.apache.zookeeper=WARN
<type>content</type>
<show-property-name>false</show-property-name>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-defaults.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-defaults.xml b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-defaults.xml
index a7d00e2..003b716 100644
--- a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-defaults.xml
+++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-defaults.xml
@@ -27,8 +27,7 @@
This is memory that accounts for things like VM overheads, interned strings,
other native overheads, etc.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>spark.driver.extraLibraryPath</name>
@@ -36,8 +35,7 @@
<description>
Set a special library path to use when launching the driver JVM.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>spark.yarn.driver.memoryOverhead</name>
@@ -47,8 +45,7 @@
This is memory that accounts for things like VM overheads, interned strings,
other native overheads, etc.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>spark.yarn.scheduler.heartbeat.interval-ms</name>
@@ -56,8 +53,7 @@
<description>
The interval in ms in which the Spark application master heartbeats into the YARN ResourceManager.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>spark.yarn.max.executor.failures</name>
@@ -65,8 +61,7 @@
<description>
The maximum number of executor failures before failing the application.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>spark.yarn.queue</name>
@@ -74,8 +69,7 @@
<description>
The name of the YARN queue to which the application is submitted.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>spark.yarn.containerLauncherMaxThreads</name>
@@ -83,8 +77,7 @@
<description>
The maximum number of threads to use in the application master for launching executor containers.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>spark.yarn.submit.file.replication</name>
@@ -93,8 +86,7 @@
HDFS replication level for the files uploaded into HDFS for the application.
These include things like the Spark jar, the app jar, and any distributed cache files/archives.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>spark.yarn.preserve.staging.files</name>
@@ -103,8 +95,7 @@
Set to true to preserve the staged files (Spark jar, app jar, distributed cache files) at the
end of the job rather then delete them.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>spark.yarn.services</name>
@@ -112,8 +103,7 @@
<description>
Service required for publishing events to the YARN Application Timeline Service.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>spark.history.provider</name>
@@ -121,8 +111,7 @@
<description>
Name of the class implementing the application history backend which publishes to YARN Application Timeline Service.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>spark.history.ui.port</name>
@@ -130,8 +119,7 @@
<description>
The port to which the web interface of the History Server binds.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>spark.history.kerberos.principal</name>
@@ -139,8 +127,7 @@
<description>
Kerberos principal name for the Spark History Server.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>spark.history.kerberos.keytab</name>
@@ -148,28 +135,24 @@
<description>
Location of the kerberos keytab file for the Spark History Server.
</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>spark.history.provider</name>
<value>org.apache.spark.deploy.yarn.history.YarnHistoryProvider</value>
<description>Name of history provider class</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>spark.yarn.historyServer.address</name>
<value>{{spark_history_server_host}}:{{spark_history_ui_port}}</value>
<description>The address of the Spark history server (i.e. host.com:18080). The address should not contain a scheme (http://). Defaults to not being set since the history server is an optional service. This address is given to the YARN ResourceManager when the Spark application finishes to link the application from the ResourceManager UI to the Spark history server UI.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>spark.yarn.max.executor.failures</name>
<value>3</value>
<description>The maximum number of executor failures before failing the application.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-env.xml b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-env.xml
index 34c5462..ad3aa53 100644
--- a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-env.xml
+++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-env.xml
@@ -29,8 +29,7 @@
<type>user</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>spark_group</name>
@@ -41,8 +40,7 @@
<value-attributes>
<type>user</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>spark_log_dir</name>
@@ -51,8 +49,7 @@
<value-attributes>
<type>directory</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>spark_pid_dir</name>
@@ -60,8 +57,7 @@
<value-attributes>
<type>directory</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>spark_daemon_memory</name>
@@ -71,8 +67,7 @@
<type>int</type>
<unit>MB</unit>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<!-- spark-env.sh -->
<property>
@@ -132,8 +127,7 @@ fi
<value-attributes>
<type>content</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>spark_thrift_cmd_opts</name>
@@ -142,7 +136,6 @@ fi
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-log4j-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-log4j-properties.xml b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-log4j-properties.xml
index 9de605a..124bc1a 100644
--- a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-log4j-properties.xml
+++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-log4j-properties.xml
@@ -42,7 +42,6 @@ log4j.logger.org.apache.spark.repl.SparkILoop$SparkILoopInterpreter=INFO
<type>content</type>
<show-property-name>false</show-property-name>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-metrics-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-metrics-properties.xml b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-metrics-properties.xml
index 783f6c5..91ac2a9 100644
--- a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-metrics-properties.xml
+++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-metrics-properties.xml
@@ -161,7 +161,6 @@
<type>content</type>
<show-property-name>false</show-property-name>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
</configuration>