You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sr...@apache.org on 2016/06/02 01:59:53 UTC
[46/98] [abbrv] [partial] ambari git commit: Revert "AMBARI-16272.
Ambari Upgrade shouldn't automatically add stack configs. Fix default upgrade
policy (dlysnichenko)" - failed testcases.
http://git-wip-us.apache.org/repos/asf/ambari/blob/55dd6c8a/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-audit.xml b/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-audit.xml
index d096458..6af85be 100644
--- a/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-audit.xml
+++ b/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-audit.xml
@@ -23,8 +23,8 @@
<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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.db</name>
@@ -40,22 +40,22 @@
<name>xasecure.audit.destination.db</name>
</property>
</depends-on>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.db.password</name>
@@ -65,29 +65,29 @@
<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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.db.batch.filespool.dir</name>
<value>/var/log/kafka/audit/db/spool</value>
<description>/var/log/kafka/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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.hdfs</name>
@@ -103,8 +103,8 @@
<name>xasecure.audit.destination.hdfs</name>
</property>
</depends-on>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.hdfs.dir</name>
@@ -116,15 +116,15 @@
<name>xasecure.audit.destination.hdfs.dir</name>
</property>
</depends-on>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.hdfs.batch.filespool.dir</name>
<value>/var/log/kafka/audit/hdfs/spool</value>
<description>/var/log/kafka/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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.solr</name>
@@ -140,8 +140,8 @@
<name>xasecure.audit.destination.solr</name>
</property>
</depends-on>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.solr.urls</name>
@@ -156,8 +156,8 @@
<name>ranger.audit.solr.urls</name>
</property>
</depends-on>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.solr.zookeepers</name>
@@ -169,15 +169,15 @@
<name>ranger.audit.solr.zookeepers</name>
</property>
</depends-on>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.destination.solr.batch.filespool.dir</name>
<value>/var/log/kafka/audit/solr/spool</value>
<description>/var/log/kafka/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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>xasecure.audit.provider.summary.enabled</name>
@@ -187,7 +187,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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/55dd6c8a/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 398bb8b..e653a2e 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
@@ -24,8 +24,8 @@
<value>ambari-qa</value>
<display-name>Policy user for KAFKA</display-name>
<description>This user must be system user and also present at Ranger admin portal</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>hadoop.rpc.protection</name>
@@ -34,8 +34,8 @@
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>common.name.for.certificate</name>
@@ -44,16 +44,16 @@
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>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="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>ranger-kafka-plugin-enabled</name>
@@ -70,16 +70,16 @@
<type>boolean</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>REPOSITORY_CONFIG_USERNAME</name>
<value>kafka</value>
<display-name>Ranger repository config user</display-name>
<description>Used for repository creation on 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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>REPOSITORY_CONFIG_PASSWORD</name>
@@ -90,7 +90,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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/55dd6c8a/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-policymgr-ssl.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-policymgr-ssl.xml b/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-policymgr-ssl.xml
index 089b40f..af2c435 100644
--- a/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-policymgr-ssl.xml
+++ b/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-policymgr-ssl.xml
@@ -23,8 +23,8 @@
<name>xasecure.policymgr.clientssl.keystore</name>
<value>kafkadev-clientcert.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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>xasecure.policymgr.clientssl.keystore.password</name>
@@ -34,15 +34,15 @@
<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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>xasecure.policymgr.clientssl.truststore</name>
<value>cacerts-xasecure.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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>xasecure.policymgr.clientssl.truststore.password</name>
@@ -52,21 +52,21 @@
<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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/55dd6c8a/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-security.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-security.xml b/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-security.xml
index f0e10ae..cdfa9ca 100644
--- a/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-security.xml
+++ b/ambari-server/src/main/resources/common-services/KAFKA/0.9.0/configuration/ranger-kafka-security.xml
@@ -23,42 +23,42 @@
<name>ranger.plugin.kafka.service.name</name>
<value>{{repo_name}}</value>
<description>Name of the Ranger service containing policies for this Kafka 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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>ranger.plugin.kafka.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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>ranger.plugin.kafka.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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>ranger.plugin.kafka.policy.rest.ssl.config.file</name>
<value>/etc/kafka/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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>ranger.plugin.kafka.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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>ranger.plugin.kafka.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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/55dd6c8a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
index 5186b44..9cd0398 100644
--- a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
+++ b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
@@ -31,8 +31,8 @@
<type>componentHost</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>manage_identities</name>
@@ -47,8 +47,8 @@
<overridable>false</overridable>
<type>boolean</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>manage_auth_to_local</name>
@@ -62,8 +62,8 @@
<overridable>false</overridable>
<type>boolean</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>install_packages</name>
@@ -78,8 +78,8 @@
<type>boolean</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property require-input="true">
<name>ldap_url</name>
@@ -93,8 +93,8 @@
<visible>false</visible>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property require-input="true">
<name>container_dn</name>
@@ -107,8 +107,8 @@
<overridable>false</overridable>
</value-attributes>
<value/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property require-input="true">
<name>encryption_types</name>
@@ -121,8 +121,8 @@
<type>multiLine</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property require-input="true">
<name>realm</name>
@@ -136,8 +136,8 @@
<editable-only-at-install>true</editable-only-at-install>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property require-input="true">
<name>kdc_hosts</name>
@@ -151,8 +151,8 @@
<value-attributes>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property require-input="true">
<name>admin_server_host</name>
@@ -165,8 +165,8 @@
<type>host</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>executable_search_paths</name>
@@ -179,8 +179,8 @@
<overridable>false</overridable>
<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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>password_length</name>
@@ -192,8 +192,8 @@
<value-attributes>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>password_min_lowercase_letters</name>
@@ -206,8 +206,8 @@
<type>int</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>password_min_uppercase_letters</name>
@@ -220,8 +220,8 @@
<type>int</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>password_min_digits</name>
@@ -234,8 +234,8 @@
<type>int</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>password_min_punctuation</name>
@@ -248,8 +248,8 @@
<type>int</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>password_min_whitespace</name>
@@ -262,8 +262,8 @@
<type>int</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>service_check_principal_name</name>
@@ -275,8 +275,8 @@
<value-attributes>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>case_insensitive_username_rules</name>
@@ -289,8 +289,8 @@
<overridable>false</overridable>
<type>boolean</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>ad_create_attributes_template</name>
@@ -321,8 +321,8 @@
<empty-value-valid>true</empty-value-valid>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>create_ambari_principal</name>
@@ -336,8 +336,8 @@
<overridable>false</overridable>
<type>boolean</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>kdc_create_attributes</name>
@@ -350,8 +350,8 @@
<empty-value-valid>true</empty-value-valid>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>group</name>
@@ -364,8 +364,8 @@
<empty-value-valid>true</empty-value-valid>
<visible>false</visible>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>set_password_expiry</name>
@@ -382,8 +382,8 @@
<overridable>false</overridable>
<visible>false</visible>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>password_chat_timeout</name>
@@ -398,7 +398,7 @@
<type>int</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/55dd6c8a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/krb5-conf.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/krb5-conf.xml b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/krb5-conf.xml
index c14047a..ef44a28 100644
--- a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/krb5-conf.xml
+++ b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/krb5-conf.xml
@@ -31,8 +31,8 @@
<empty-value-valid>true</empty-value-valid>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>manage_krb5_conf</name>
@@ -45,8 +45,8 @@
<overridable>false</overridable>
<type>boolean</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>conf_dir</name>
@@ -57,8 +57,8 @@
<type>directory</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>content</name>
@@ -107,7 +107,7 @@
<type>content</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/55dd6c8a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/admin-topology.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/admin-topology.xml b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/admin-topology.xml
index f2774f8..1353ea3 100644
--- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/admin-topology.xml
+++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/admin-topology.xml
@@ -92,7 +92,7 @@
<empty-value-valid>true</empty-value-valid>
<show-property-name>false</show-property-name>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/55dd6c8a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/gateway-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/gateway-log4j.xml b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/gateway-log4j.xml
index 648ad1c..dd5aa49 100644
--- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/gateway-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/gateway-log4j.xml
@@ -82,7 +82,7 @@
<type>content</type>
<show-property-name>false</show-property-name>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/55dd6c8a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/gateway-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/gateway-site.xml b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/gateway-site.xml
index 9c7e764..4c98536 100644
--- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/gateway-site.xml
+++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/gateway-site.xml
@@ -24,49 +24,49 @@ limitations under the License.
<name>gateway.port</name>
<value>8443</value>
<description>The HTTP port for the Gateway.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>gateway.path</name>
<value>gateway</value>
<description>The default context path for the gateway.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>gateway.gateway.conf.dir</name>
<value>deployments</value>
<description>The directory within GATEWAY_HOME that contains gateway topology files and deployments.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>gateway.hadoop.kerberos.secured</name>
<value>false</value>
<description>Boolean flag indicating whether the Hadoop cluster protected by Gateway is secured with 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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>java.security.krb5.conf</name>
<value>/etc/knox/conf/krb5.conf</value>
<description>Absolute path to krb5.conf file</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>java.security.auth.login.config</name>
<value>/etc/knox/conf/krb5JAASLogin.conf</value>
<description>Absolute path to JASS login config file</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>sun.security.krb5.debug</name>
<value>true</value>
<description>Boolean flag indicating whether to enable debug messages for krb5 authentication</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/55dd6c8a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/knox-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/knox-env.xml b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/knox-env.xml
index fa1c3f8..4869290 100644
--- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/knox-env.xml
+++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/knox-env.xml
@@ -32,8 +32,8 @@
<editable-only-at-install>true</editable-only-at-install>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>knox_user</name>
@@ -45,8 +45,8 @@
<type>user</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>knox_group</name>
@@ -57,8 +57,8 @@
<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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>knox_pid_dir</name>
@@ -70,19 +70,19 @@
<editable-only-at-install>true</editable-only-at-install>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>knox_principal_name</name>
<description>Knox principal name</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>knox_keytab_path</name>
<description>Knox keytab path</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/55dd6c8a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ldap-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ldap-log4j.xml b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ldap-log4j.xml
index 2c8037a..0ef4fd0 100644
--- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ldap-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ldap-log4j.xml
@@ -65,7 +65,7 @@
<type>content</type>
<show-property-name>false</show-property-name>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/55dd6c8a/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 22d00d3..cfc0a7d 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
@@ -24,8 +24,8 @@
<value>ambari-qa</value>
<display-name>Policy user for KNOX</display-name>
<description>This user must be system user and also present at Ranger admin portal</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>common.name.for.certificate</name>
@@ -34,8 +34,8 @@
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>ranger-knox-plugin-enabled</name>
@@ -52,16 +52,16 @@
<type>boolean</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>REPOSITORY_CONFIG_USERNAME</name>
<value>admin</value>
<display-name>Ranger repository config user</display-name>
<description>Used for repository creation on 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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>REPOSITORY_CONFIG_PASSWORD</name>
@@ -72,16 +72,16 @@
<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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>KNOX_HOME</name>
<value>/usr/local/knox-server</value>
<display-name>Knox Home</display-name>
<description>Knox home folder</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>XAAUDIT.DB.IS_ENABLED</name>
@@ -97,8 +97,8 @@
<name>xasecure.audit.destination.db</name>
</property>
</depends-on>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>XAAUDIT.HDFS.IS_ENABLED</name>
@@ -114,8 +114,8 @@
<name>xasecure.audit.destination.hdfs</name>
</property>
</depends-on>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>XAAUDIT.HDFS.DESTINATION_DIRECTORY</name>
@@ -128,71 +128,71 @@
<name>xasecure.audit.destination.hdfs.dir</name>
</property>
</depends-on>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>XAAUDIT.HDFS.LOCAL_BUFFER_DIRECTORY</name>
<value>__REPLACE__LOG_DIR/hadoop/%app-type%/audit</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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>XAAUDIT.HDFS.LOCAL_ARCHIVE_DIRECTORY</name>
<value>__REPLACE__LOG_DIR/hadoop/%app-type%/audit/archive</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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>XAAUDIT.HDFS.DESTINTATION_FILE</name>
<value>%hostname%-audit.log</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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>XAAUDIT.HDFS.DESTINTATION_FLUSH_INTERVAL_SECONDS</name>
<value>900</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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>XAAUDIT.HDFS.DESTINTATION_ROLLOVER_INTERVAL_SECONDS</name>
<value>86400</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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>XAAUDIT.HDFS.DESTINTATION_OPEN_RETRY_INTERVAL_SECONDS</name>
<value>60</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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>XAAUDIT.HDFS.LOCAL_BUFFER_FILE</name>
<value>%time:yyyyMMdd-HHmm.ss%.log</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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>XAAUDIT.HDFS.LOCAL_BUFFER_FLUSH_INTERVAL_SECONDS</name>
<value>60</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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>XAAUDIT.HDFS.LOCAL_BUFFER_ROLLOVER_INTERVAL_SECONDS</name>
<value>600</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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>XAAUDIT.HDFS.LOCAL_ARCHIVE_MAX_FILE_COUNT</name>
@@ -201,30 +201,30 @@
<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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>SSL_KEYSTORE_FILE_PATH</name>
<value>/etc/hadoop/conf/ranger-plugin-keystore.jks</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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>SSL_KEYSTORE_PASSWORD</name>
<value>myKeyFilePassword</value>
<property-type>PASSWORD</property-type>
<description/>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>SSL_TRUSTSTORE_FILE_PATH</name>
<value>/etc/hadoop/conf/ranger-plugin-truststore.jks</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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>SSL_TRUSTSTORE_PASSWORD</name>
@@ -234,43 +234,43 @@
<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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>POLICY_MGR_URL</name>
<value>{{policymgr_mgr_url}}</value>
<description>Policy Manager 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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>SQL_CONNECTOR_JAR</name>
<value>{{sql_connector_jar}}</value>
<description>Location of DB client library (please check the location of the jar file)</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>XAAUDIT.DB.FLAVOUR</name>
<value>{{xa_audit_db_flavor}}</value>
<description>The database type to be used (mysql/oracle)</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>XAAUDIT.DB.DATABASE_NAME</name>
<value>{{xa_audit_db_name}}</value>
<description>Audit database name</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>XAAUDIT.DB.USER_NAME</name>
<value>{{xa_audit_db_user}}</value>
<description>Audit database 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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>XAAUDIT.DB.PASSWORD</name>
@@ -280,21 +280,21 @@
<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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>XAAUDIT.DB.HOSTNAME</name>
<value>{{xa_db_host}}</value>
<description>Audit database hostname</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>REPOSITORY_NAME</name>
<value>{{repo_name}}</value>
<description>Ranger repository name</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/55dd6c8a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/topology.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/topology.xml b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/topology.xml
index a3d3d4f..91e1f7c 100644
--- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/topology.xml
+++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/topology.xml
@@ -128,7 +128,7 @@
<name>ranger-knox-plugin-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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/55dd6c8a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/users-ldif.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/users-ldif.xml b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/users-ldif.xml
index 06f995e..1697a54 100644
--- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/users-ldif.xml
+++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/users-ldif.xml
@@ -135,7 +135,7 @@ member: uid=sam,ou=people,dc=hadoop,dc=apache,dc=org
<empty-value-valid>true</empty-value-valid>
<show-property-name>false</show-property-name>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/55dd6c8a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-env.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-env.xml
index 46ac4c2..028e055 100644
--- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-env.xml
+++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-env.xml
@@ -29,8 +29,8 @@
<value-attributes>
<type>directory</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>logfeeder_log_dir</name>
@@ -40,8 +40,8 @@
<value-attributes>
<type>directory</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>logfeeder_user</name>
@@ -53,8 +53,8 @@
<type>user</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>logfeeder_group</name>
@@ -62,16 +62,16 @@
<property-type>GROUP</property-type>
<description>logfeeder group</description>
<display-name>Logsfeeder Group</display-name>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>logfeeder_max_mem</name>
<value>512m</value>
<description>Max Memory for Logfeeder</description>
<display-name>Logfeeder max memory</display-name>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>logfeeder_solr_service_logs_enable</name>
@@ -81,8 +81,8 @@
<value-attributes>
<type>boolean</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>logfeeder_solr_audit_logs_enable</name>
@@ -92,24 +92,24 @@
<value-attributes>
<type>boolean</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>logfeeder_solr_ssl_client_truststore_location</name>
<value>/etc/security/serverKeys/logsearch-solr-ssl.trustStore.jks</value>
<display-name>Logfeeder Solr client trust store location</display-name>
<description>Location of the trust store file.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>logfeeder_solr_ssl_client_truststore_type</name>
<value>jks</value>
<display-name>Logfeeder Solr client trust store type</display-name>
<description>Type of the trust store file.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>logfeeder_solr_ssl_client_truststore_password</name>
@@ -120,24 +120,24 @@
<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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>logfeeder_solr_ssl_client_keystore_location</name>
<value>/etc/security/serverKeys/logsearch-solr-ssl.keyStore.jks</value>
<display-name>Logfeeder Solr client key store location</display-name>
<description>Location of the key store file.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>logfeeder_solr_ssl_client_keystore_type</name>
<value>jks</value>
<display-name>Logfeeder Solr client key store type</display-name>
<description>Type of the key store file.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>logfeeder_solr_ssl_client_keystore_password</name>
@@ -148,8 +148,8 @@
<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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>content</name>
@@ -161,7 +161,7 @@
<property-file-name>logfeeder-env.sh.j2</property-file-name>
<property-file-type>text</property-file-type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/55dd6c8a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-log4j.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-log4j.xml
index cb0c5a8..ec94796 100644
--- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-log4j.xml
@@ -32,7 +32,7 @@
<property-file-name>logfeeder-log4j.xml.j2</property-file-name>
<property-file-type>xml</property-file-type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/55dd6c8a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-properties.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-properties.xml
index a140dc7..1562d77 100644
--- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-properties.xml
+++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-properties.xml
@@ -25,8 +25,8 @@
<value>{default_config_files}</value>
<description>Comma separated config files in grok format</description>
<display-name>Logfeeder config files</display-name>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>logfeeder.checkpoint.folder</name>
@@ -36,16 +36,16 @@
<value-attributes>
<type>directory</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>logfeeder.metrics.collector.hosts</name>
<value>{metrics_collector_hosts}</value>
<description>Metrics collector hosts for pushing metrics by Logfeeder</description>
<display-name>Metrics collector hosts</display-name>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>logfeeder.log.filter.enable</name>
@@ -55,8 +55,8 @@
<value-attributes>
<type>boolean</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>logfeeder.solr.config.interval</name>
@@ -66,7 +66,7 @@
<value-attributes>
<type>int</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/55dd6c8a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-admin-json.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-admin-json.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-admin-json.xml
index 382a155..54e59ae 100644
--- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-admin-json.xml
+++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-admin-json.xml
@@ -25,8 +25,8 @@
<value>ambari_logsearch_admin</value>
<display-name>Admin username</display-name>
<description>Log Search admin username</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property require-input="true">
<name>logsearch_admin_password</name>
@@ -38,8 +38,8 @@
<overridable>false</overridable>
<type>password</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>content</name>
@@ -51,7 +51,7 @@
<property-file-name>logsearch-admin.json.j2</property-file-name>
<property-file-type>text</property-file-type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/55dd6c8a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-audit_logs-solrconfig.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-audit_logs-solrconfig.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-audit_logs-solrconfig.xml
index 1629397..0817a9d 100644
--- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-audit_logs-solrconfig.xml
+++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-audit_logs-solrconfig.xml
@@ -30,8 +30,8 @@
<type>int</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>logsearch_audit_logs_merge_factor</name>
@@ -45,8 +45,8 @@
<type>int</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<!-- solrconfig.xml -->
<property>
@@ -59,7 +59,7 @@
<property-file-name>audit_logs-solrconfig.xml.j2</property-file-name>
<property-file-type>xml</property-file-type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/55dd6c8a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-env.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-env.xml
index 7943cd0..d9d39f4 100644
--- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-env.xml
+++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-env.xml
@@ -26,8 +26,8 @@
<value>61888</value>
<description>Default port for Log Search UI</description>
<display-name>Log Search UI Port</display-name>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>logsearch_pid_dir</name>
@@ -37,8 +37,8 @@
<value-attributes>
<type>directory</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>logsearch_log_dir</name>
@@ -48,8 +48,8 @@
<value-attributes>
<type>directory</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>logsearch_user</name>
@@ -61,8 +61,8 @@
<type>user</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>logsearch_group</name>
@@ -70,8 +70,8 @@
<property-type>GROUP</property-type>
<description>Log Search group</description>
<display-name>Log Search Group</display-name>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>logsearch_app_max_memory</name>
@@ -85,8 +85,8 @@
<unit>MB</unit>
<increment-step>256</increment-step>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>logsearch_solr_audit_logs_use_ranger</name>
@@ -97,8 +97,8 @@
<value-attributes>
<type>boolean</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>logsearch_debug_enabled</name>
@@ -108,48 +108,48 @@
<value-attributes>
<type>boolean</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>logsearch_debug_port</name>
<value>5005</value>
<display-name>Log Search Debug Port</display-name>
<description>Debug port for Log Search 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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>logsearch_solr_audit_logs_zk_node</name>
<value>{logsearch_solr_znode}</value>
<display-name>Solr Audit Logs Znode</display-name>
<description>Only needed if using custom solr cloud. E.g. /audit_logs</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>logsearch_solr_audit_logs_zk_quorum</name>
<value>{zookeeper_quorum}</value>
<display-name>Solr Audit Logs ZK Quorum</display-name>
<description>Only needed if using custom solr cloud. E.g. zk1:2181,zk2:2182</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>logsearch_solr_ssl_client_truststore_location</name>
<value>/etc/security/serverKeys/logsearch-solr-ssl.trustStore.jks</value>
<display-name>Log Search Solr client trust store location</display-name>
<description>Location of the trust store file.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>logsearch_solr_ssl_client_truststore_type</name>
<value>jks</value>
<display-name>Log Search Solr client trust store type</display-name>
<description>Type of the trust store file.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>logsearch_solr_ssl_client_truststore_password</name>
@@ -160,24 +160,24 @@
<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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>logsearch_solr_ssl_client_keystore_location</name>
<value>/etc/security/serverKeys/logsearch-solr-ssl.keyStore.jks</value>
<display-name>Log Search Solr client key store location</display-name>
<description>Location of the key store file.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>logsearch_solr_ssl_client_keystore_type</name>
<value>jks</value>
<display-name>Log Search Solr client key store type</display-name>
<description>Type of the key store file.</description>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>logsearch_solr_ssl_client_keystore_password</name>
@@ -188,8 +188,8 @@
<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" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<!-- logsearch-env.sh -->
<property>
@@ -202,7 +202,7 @@
<property-file-name>logsearch-env.sh.j2</property-file-name>
<property-file-type>text</property-file-type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/55dd6c8a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-log4j.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-log4j.xml
index c21abc5..4706ea3 100644
--- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-log4j.xml
@@ -32,7 +32,7 @@
<property-file-name>logsearch-log4j.xml.j2</property-file-name>
<property-file-type>xml</property-file-type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
</configuration>