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:49 UTC
[89/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/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..d5a36c2 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,7 @@
<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" update="false" delete="false"/>
</property>
<property>
<name>common.name.for.certificate</name>
@@ -34,8 +33,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-knox-plugin-enabled</name>
@@ -52,16 +50,14 @@
<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" update="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" update="false" delete="false"/>
</property>
<property>
<name>REPOSITORY_CONFIG_PASSWORD</name>
@@ -72,16 +68,14 @@
<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>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" update="false" delete="false"/>
</property>
<property>
<name>XAAUDIT.DB.IS_ENABLED</name>
@@ -97,8 +91,7 @@
<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" update="false" delete="false"/>
</property>
<property>
<name>XAAUDIT.HDFS.IS_ENABLED</name>
@@ -114,8 +107,7 @@
<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" update="false" delete="false"/>
</property>
<property>
<name>XAAUDIT.HDFS.DESTINATION_DIRECTORY</name>
@@ -128,71 +120,61 @@
<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" update="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" update="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" update="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" update="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" update="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" update="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" update="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" update="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" update="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" update="false" delete="false"/>
</property>
<property>
<name>XAAUDIT.HDFS.LOCAL_ARCHIVE_MAX_FILE_COUNT</name>
@@ -201,30 +183,26 @@
<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>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" update="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" update="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" update="false" delete="false"/>
</property>
<property>
<name>SSL_TRUSTSTORE_PASSWORD</name>
@@ -234,43 +212,37 @@
<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>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" update="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" update="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" update="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" update="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" update="false" delete="false"/>
</property>
<property>
<name>XAAUDIT.DB.PASSWORD</name>
@@ -280,21 +252,18 @@
<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>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" update="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" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/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..9847c8b 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,6 @@
<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" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/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..0b716ce 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,6 @@ 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" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/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..7412299 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,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>logfeeder_log_dir</name>
@@ -40,8 +39,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>logfeeder_user</name>
@@ -53,8 +51,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>logfeeder_group</name>
@@ -62,16 +59,14 @@
<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" update="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" update="false" delete="false"/>
</property>
<property>
<name>logfeeder_solr_service_logs_enable</name>
@@ -81,8 +76,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>logfeeder_solr_audit_logs_enable</name>
@@ -92,24 +86,21 @@
<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>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" update="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" update="false" delete="false"/>
</property>
<property>
<name>logfeeder_solr_ssl_client_truststore_password</name>
@@ -120,24 +111,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" update="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" update="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" update="false" delete="false"/>
</property>
<property>
<name>logfeeder_solr_ssl_client_keystore_password</name>
@@ -148,8 +136,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>content</name>
@@ -161,7 +148,6 @@
<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" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/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..6501c41 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,6 @@
<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" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/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..da9aac0 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,7 @@
<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" update="false" delete="false"/>
</property>
<property>
<name>logfeeder.checkpoint.folder</name>
@@ -36,16 +35,14 @@
<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>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" update="false" delete="false"/>
</property>
<property>
<name>logfeeder.log.filter.enable</name>
@@ -55,8 +52,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>logfeeder.solr.config.interval</name>
@@ -66,7 +62,6 @@
<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" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/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..9cb4494 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,7 @@
<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" update="false" delete="false"/>
</property>
<property require-input="true">
<name>logsearch_admin_password</name>
@@ -38,8 +37,7 @@
<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" update="false" delete="false"/>
</property>
<property>
<name>content</name>
@@ -51,7 +49,6 @@
<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" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/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..7745175 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,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" update="false" delete="false"/>
</property>
<property>
<name>logsearch_audit_logs_merge_factor</name>
@@ -45,8 +44,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" update="false" delete="false"/>
</property>
<!-- solrconfig.xml -->
<property>
@@ -59,7 +57,6 @@
<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" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/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..0af03f8 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,7 @@
<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" update="false" delete="false"/>
</property>
<property>
<name>logsearch_pid_dir</name>
@@ -37,8 +36,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>logsearch_log_dir</name>
@@ -48,8 +46,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>logsearch_user</name>
@@ -61,8 +58,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>logsearch_group</name>
@@ -70,8 +66,7 @@
<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" update="false" delete="false"/>
</property>
<property>
<name>logsearch_app_max_memory</name>
@@ -85,8 +80,7 @@
<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" update="false" delete="false"/>
</property>
<property>
<name>logsearch_solr_audit_logs_use_ranger</name>
@@ -97,8 +91,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>logsearch_debug_enabled</name>
@@ -108,48 +101,42 @@
<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>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" update="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" update="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" update="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" update="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" update="false" delete="false"/>
</property>
<property>
<name>logsearch_solr_ssl_client_truststore_password</name>
@@ -160,24 +147,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" update="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" update="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" update="false" delete="false"/>
</property>
<property>
<name>logsearch_solr_ssl_client_keystore_password</name>
@@ -188,8 +172,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>
<!-- logsearch-env.sh -->
<property>
@@ -202,7 +185,6 @@
<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" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/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..c84ed43 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,6 @@
<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" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-properties.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-properties.xml
index 65dc378..6f22263 100644
--- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-properties.xml
+++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-properties.xml
@@ -20,7 +20,6 @@
*/
-->
<configuration>
-
<property>
<name>logsearch.collection.service.logs.numshards</name>
<value>5</value>
@@ -33,10 +32,8 @@
<unit>int</unit>
<increment-step>1</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" update="false" delete="false"/>
</property>
-
<property>
<name>logsearch.collection.service.logs.replication.factor</name>
<value>1</value>
@@ -49,10 +46,8 @@
<unit>int</unit>
<increment-step>1</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" update="false" delete="false"/>
</property>
-
<property>
<name>logsearch.collection.audit.logs.numshards</name>
<value>5</value>
@@ -65,10 +60,8 @@
<unit>int</unit>
<increment-step>1</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" update="false" delete="false"/>
</property>
-
<property>
<name>logsearch.collection.audit.logs.replication.factor</name>
<value>1</value>
@@ -81,72 +74,57 @@
<unit>int</unit>
<increment-step>1</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" update="false" delete="false"/>
</property>
-
<property>
<name>logsearch.solr.collection.service.logs</name>
<value>hadoop_logs</value>
<display-name>Log Search Solr Service Logs Collection</display-name>
<description>Name for the service logs collection</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>logsearch.solr.collection.audit.logs</name>
<value>audit_logs</value>
<display-name>Log Search Solr Audit Logs Collection</display-name>
<description>Name for the audit logs collection</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>logsearch.service.logs.fields</name>
<value>logtime,level,event_count,ip,type,seq_num,path,file,line_number,host,log_message,id</value>
<display-name>Log Search Solr Service Logs Fields</display-name>
<description>Solr fields for service 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" update="false" delete="false"/>
</property>
-
<property>
<name>logsearch.service.logs.split.interval.mins</name>
<value>15</value>
<display-name>Log Search Service Logs split interval</display-name>
<description>Will create multiple collections and use alias. Valid values are single,hour_week</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>logsearch.audit.logs.split.interval.mins</name>
<value>15</value>
<display-name>Log Search Audit Logs split interval</display-name>
<description>Will switch the shard after the interval specified. Valid values are none and greater than 1
</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>logsearch.logfeeder.include.default.level</name>
<value>FATAL,ERROR,WARN</value>
<description>Include default Logfeeder log levels for Log Search</description>
<display-name>Logfeeder log levels</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" update="false" delete="false"/>
</property>
-
<property>
<name>logsearch.solr.metrics.collector.hosts</name>
<value>{metrics_collector_hosts}</value>
<description>Metrics collector hosts for pushing metrics by Log Search Solr</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" update="false" delete="false"/>
</property>
<property>
<name>logsearch.external.auth.enabled</name>
@@ -156,23 +134,20 @@
<value-attributes>
<type>boolean</type>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property>
<name>logsearch.external.auth.host_url</name>
<value>{ambari_server_auth_host_url}</value>
<display-name>External authentication url - host and port</display-name>
<description>The host and port of the external server used to authenticate</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>logsearch.external.auth.login_url</name>
<value>/api/v1/users/$USERNAME/privileges?fields=*</value>
<display-name>External authentication url - path and query</display-name>
<description>The path and query of the external server used to authenticate</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/LOGSEARCH/0.5.0/configuration/logsearch-service_logs-solrconfig.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-service_logs-solrconfig.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-service_logs-solrconfig.xml
index a51295f..ba28c7e 100644
--- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-service_logs-solrconfig.xml
+++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-service_logs-solrconfig.xml
@@ -30,8 +30,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" update="false" delete="false"/>
</property>
<property>
<name>logsearch_service_logs_merge_factor</name>
@@ -45,8 +44,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" update="false" delete="false"/>
</property>
<!-- solrconfig.xml -->
<property>
@@ -59,7 +57,6 @@
<property-file-name>service_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" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-client-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-client-log4j.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-client-log4j.xml
index 67e67b5..2f1b5a0 100644
--- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-client-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-client-log4j.xml
@@ -32,7 +32,6 @@
<property-file-name>solr-client-log4j.properties.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" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-env.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-env.xml
index 73fecb6..4e98528 100644
--- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-env.xml
+++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-env.xml
@@ -26,16 +26,14 @@
<value>8886</value>
<description>Solr port</description>
<display-name>Log Search Solr 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" update="false" delete="false"/>
</property>
<property>
<name>logsearch_solr_jmx_port</name>
<value>18886</value>
<description>Solr JMX port</description>
<display-name>Log Search Solr JMX 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" update="false" delete="false"/>
</property>
<property>
<name>logsearch_solr_pid_dir</name>
@@ -45,8 +43,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>logsearch_solr_log_dir</name>
@@ -56,8 +53,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>logsearch_solr_client_log_dir</name>
@@ -67,8 +63,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>logsearch_solr_user</name>
@@ -80,8 +75,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>logsearch_solr_group</name>
@@ -89,8 +83,7 @@
<property-type>GROUP</property-type>
<description>Solr group</description>
<display-name>Log Search Solr 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" update="false" delete="false"/>
</property>
<property>
<name>logsearch_solr_datadir</name>
@@ -101,8 +94,7 @@
<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" update="false" delete="false"/>
</property>
<property>
<name>logsearch_solr_ssl_enabled</name>
@@ -112,24 +104,21 @@
<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>logsearch_solr_ssl_server_truststore_location</name>
<value>/etc/security/serverKeys/logsearch-solr-ssl.trustStore.jks</value>
<display-name>Log Search Solr 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" update="false" delete="false"/>
</property>
<property>
<name>logsearch_solr_ssl_server_truststore_type</name>
<value>jks</value>
<display-name>Log Search Solr 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" update="false" delete="false"/>
</property>
<property>
<name>logsearch_solr_ssl_server_truststore_password</name>
@@ -140,24 +129,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" update="false" delete="false"/>
</property>
<property>
<name>logsearch_solr_ssl_server_keystore_location</name>
<value>/etc/security/serverKeys/logsearch-solr-ssl.keyStore.jks</value>
<display-name>Log Search Solr 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" update="false" delete="false"/>
</property>
<property>
<name>logsearch_solr_ssl_server_keystore_type</name>
<value>jks</value>
<display-name>Log Search Solr 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" update="false" delete="false"/>
</property>
<property>
<name>logsearch_solr_ssl_server_keystore_password</name>
@@ -168,8 +154,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>logsearch_solr_znode</name>
@@ -179,8 +164,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>logsearch_solr_minmem</name>
@@ -194,8 +178,7 @@
<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" update="false" delete="false"/>
</property>
<property>
<name>logsearch_solr_maxmem</name>
@@ -209,8 +192,7 @@
<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" update="false" delete="false"/>
</property>
<!-- logsearch-solr-env.sh -->
<property>
@@ -223,7 +205,6 @@
<property-file-name>logsearch-solr-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" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-log4j.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-log4j.xml
index b5b3e59..6f602cf 100644
--- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-log4j.xml
@@ -30,7 +30,6 @@
<property-file-name>solr-log4j.properties.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" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-xml.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-xml.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-xml.xml
index bf2fef2..73396a9 100644
--- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-xml.xml
+++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-solr-xml.xml
@@ -30,7 +30,6 @@
<property-file-name>solr.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" update="false" delete="false"/>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-env.xml b/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-env.xml
index 196397a..bb2edc0 100644
--- a/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-env.xml
+++ b/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-env.xml
@@ -30,7 +30,6 @@
<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>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4c5cf30e/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-log4j.xml b/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-log4j.xml
index b791f66..e295649 100644
--- a/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-log4j.xml
@@ -63,7 +63,6 @@ log4j.logger.org.apache.spark.repl.SparkILoop$SparkILoopInterpreter=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/OOZIE/4.0.0.2.0/configuration/oozie-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml
index 1d1c821..c74496d 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml
@@ -30,15 +30,13 @@
<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>oozie_admin_users</name>
<value>{oozie_user}, oozie-admin</value>
<description>Oozie admin users.</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>oozie_database</name>
@@ -48,8 +46,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>oozie_data_dir</name>
@@ -61,8 +58,7 @@
<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" update="false" delete="false"/>
</property>
<property>
<name>oozie_log_dir</name>
@@ -73,8 +69,7 @@
<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" update="false" delete="false"/>
</property>
<property>
<name>oozie_tmp_dir</name>
@@ -85,8 +80,7 @@
<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" update="false" delete="false"/>
</property>
<property>
<name>oozie_pid_dir</name>
@@ -98,8 +92,7 @@
<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" update="false" delete="false"/>
</property>
<property>
<name>oozie_admin_port</name>
@@ -110,36 +103,31 @@
<overridable>false</overridable>
<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" update="false" delete="false"/>
</property>
<property>
<name>oozie_heapsize</name>
<value>2048</value>
<description>Oozie heap size.</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>oozie_permsize</name>
<value>256</value>
<description>Oozie permanent generation size.</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>oozie_user_nofile_limit</name>
<value>32000</value>
<description>Max open files limit setting for OOZIE 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>oozie_user_nproc_limit</name>
<value>16000</value>
<description>Max number of processes limit setting for OOZIE 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>
<!-- oozie-env.sh -->
<property>
@@ -214,7 +202,6 @@ export JAVA_LIBRARY_PATH={{hadoop_lib_home}}/native/Linux-amd64-64
<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/OOZIE/4.0.0.2.0/configuration/oozie-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-log4j.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-log4j.xml
index e2569cb..87f029a 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-log4j.xml
@@ -109,7 +109,6 @@ log4j.logger.org.apache.hadoop.security.authentication.server=WARN, oozie
<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/OOZIE/4.0.0.2.0/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-site.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-site.xml
index 59e75b4..1ac8bd7 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-site.xml
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-site.xml
@@ -26,8 +26,7 @@
<value>http://localhost:11000/oozie</value>
<property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>Base Oozie 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>oozie.system.id</name>
@@ -35,8 +34,7 @@
<description>
The Oozie system ID.
</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>oozie.systemmode</name>
@@ -44,8 +42,7 @@
<description>
System mode for Oozie at startup.
</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>oozie.service.AuthorizationService.security.enabled</name>
@@ -54,8 +51,7 @@
Specifies whether security (user name/admin role) is enabled or not.
If disabled any user can manage Oozie system and manage any job.
</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>oozie.service.PurgeService.older.than</name>
@@ -63,8 +59,7 @@
<description>
Jobs older than this value, in days, will be purged by the PurgeService.
</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>oozie.service.PurgeService.purge.interval</name>
@@ -72,22 +67,19 @@
<description>
Interval at which the purge service will run, in seconds.
</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>oozie.service.CallableQueueService.queue.size</name>
<value>1000</value>
<description>Max callable queue size</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>oozie.service.CallableQueueService.threads</name>
<value>10</value>
<description>Number of threads used for executing callables</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>oozie.service.CallableQueueService.callable.concurrency</name>
@@ -99,8 +91,7 @@
All commands that use action executors (action-start, action-end, action-kill and action-check) use
the action type as the callable 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" update="false" delete="false"/>
</property>
<property>
<name>oozie.service.coord.normal.default.timeout</name>
@@ -108,8 +99,7 @@
<description>Default timeout for a coordinator action input check (in minutes) for normal job.
-1 means infinite timeout
</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>oozie.db.schema.name</name>
@@ -122,8 +112,7 @@
<type>database</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>oozie.authentication.type</name>
@@ -132,8 +121,7 @@
Authentication used for Oozie HTTP endpoint, the supported values are: simple | kerberos |
#AUTHENTICATION_HANDLER_CLASSNAME#.
</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>oozie.service.WorkflowAppService.system.libpath</name>
@@ -143,8 +131,7 @@
This path is added to workflow application if their job properties sets
the property 'oozie.use.system.libpath' to true.
</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>use.system.libpath.for.mapreduce.and.pig.jobs</name>
@@ -155,14 +142,12 @@
specify where the Pig JAR files are. Instead, the ones from the system
library path are 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>oozie.authentication.kerberos.name.rules</name>
<description>The mapping from kerberos principal names to local OS user names.</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>oozie.service.HadoopAccessorService.hadoop.configurations</name>
@@ -175,8 +160,7 @@
the Oozie configuration directory; though the path can be absolute (i.e. to point
to Hadoop client conf/ directories in the local filesystem.
</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>oozie.service.ActionService.executor.ext.classes</name>
@@ -192,8 +176,7 @@
be used in workflows. This property is a convenience property to add extensions to the built in executors without
having to include all the built in ones.
</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>oozie.service.SchemaService.wf.ext.schemas</name>
@@ -202,8 +185,7 @@
Schemas for additional actions types. IMPORTANT: if there are no schemas leave a 1 space string, the service
trims the value, if empty Configuration assumes it is NULL.
</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>oozie.service.JPAService.create.db.schema</name>
@@ -214,8 +196,7 @@
If set to true, it creates the DB schema if it does not exist. If the DB schema exists is a NOP.
If set to false, it does not create the DB schema. If the DB schema does not exist it fails start up.
</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>oozie.service.JPAService.jdbc.driver</name>
@@ -227,8 +208,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>oozie.service.JPAService.jdbc.url</name>
@@ -240,8 +220,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>oozie.service.JPAService.jdbc.username</name>
@@ -254,8 +233,7 @@
<type>db_user</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property require-input="true">
<name>oozie.service.JPAService.jdbc.password</name>
@@ -272,8 +250,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>oozie.service.JPAService.pool.max.active.conn</name>
@@ -281,8 +258,7 @@
<description>
Max number of connections.
</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>oozie.services</name>
@@ -320,8 +296,7 @@
org.apache.oozie.service.ProxyUserService
</value>
<description>List of Oozie services</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>oozie.service.HadoopAccessorService.kerberos.enabled</name>
@@ -329,8 +304,7 @@
<description>
Indicates if Oozie is configured to use 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>oozie.service.URIHandlerService.uri.handlers</name>
@@ -338,8 +312,7 @@
<description>
Enlist the different uri handlers supported for data availability checks.
</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>oozie.services.ext</name>
@@ -349,8 +322,7 @@
To add/replace services defined in 'oozie.services' with custom implementations.
Class names must be separated by commas.
</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>oozie.service.coord.push.check.requeue.interval</name>
@@ -358,8 +330,7 @@
<description>
Command re-queue interval for push dependencies (in millisecond).
</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>oozie.credentials.credentialclasses</name>
@@ -367,7 +338,6 @@
<description>
Credential Class to be used for HCat.
</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/OOZIE/4.2.0.2.3/configuration/oozie-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-env.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-env.xml
index 24a41f1..fde47a4 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-env.xml
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-env.xml
@@ -102,7 +102,6 @@ export JAVA_LIBRARY_PATH="$JAVA_LIBRARY_PATH:{{jdbc_libs_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/OOZIE/4.2.0.2.3/configuration/oozie-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-log4j.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-log4j.xml
index de72d8a..810c11d 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-log4j.xml
@@ -132,7 +132,6 @@ log4j.logger.org.apache.hadoop.security.authentication.server=WARN, oozie
<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/OOZIE/4.2.0.2.3/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-site.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-site.xml
index c520dbc..a55e452 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-site.xml
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-site.xml
@@ -20,8 +20,7 @@
<property>
<name>oozie.authentication.kerberos.name.rules</name>
<description>The mapping from kerberos principal names to local OS user names.</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>oozie.authentication.type</name>
@@ -30,16 +29,14 @@
Authentication used for Oozie HTTP endpoint, the supported values are: simple | kerberos |
#AUTHENTICATION_HANDLER_CLASSNAME#.
</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>oozie.base.url</name>
<value>http://localhost:11000/oozie</value>
<property-type>DONT_ADD_ON_UPGRADE</property-type>
<description>Base Oozie URL.</description>
- <on-ambari-upgrade add="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>oozie.credentials.credentialclasses</name>
@@ -47,8 +44,7 @@
<description>
Credential Class to be used for HCat.
</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>oozie.service.HadoopAccessorService.hadoop.configurations</name>
@@ -61,8 +57,7 @@
the Oozie configuration directory; though the path can be absolute (i.e. to point
to Hadoop client conf/ directories in the local filesystem.
</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>oozie.service.HadoopAccessorService.kerberos.enabled</name>
@@ -70,8 +65,7 @@
<description>
Indicates if Oozie is configured to use 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>oozie.service.URIHandlerService.uri.handlers</name>
@@ -80,8 +74,7 @@
<description>
Enlist the different uri handlers supported for data availability checks.
</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>oozie.services.ext</name>
@@ -92,8 +85,7 @@
To add/replace services defined in 'oozie.services' with custom implementations.
Class names must be separated by commas.
</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>oozie.db.schema.name</name>
@@ -106,8 +98,7 @@
<type>database</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>oozie.service.JPAService.jdbc.username</name>
@@ -120,8 +111,7 @@
<type>db_user</type>
<overridable>false</overridable>
</value-attributes>
- <on-ambari-upgrade add="false" change="true" delete="true"/>
- <on-stack-upgrade add="true" change="true" delete="false"/>
+ <on-ambari-upgrade add="true" update="false" delete="false"/>
</property>
<property require-input="true">
<name>oozie.service.JPAService.jdbc.password</name>
@@ -138,8 +128,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>oozie.service.JPAService.jdbc.driver</name>
@@ -157,8 +146,7 @@
<name>oozie_database</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>oozie.service.JPAService.jdbc.url</name>
@@ -180,8 +168,7 @@
<name>oozie.db.schema.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>oozie.service.AuthorizationService.security.enabled</name>
@@ -190,8 +177,7 @@
Specifies whether security (user name/admin role) is enabled or not.
If disabled any user can manage Oozie system and manage any job.
</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>oozie.authentication.simple.anonymous.allowed</name>
@@ -199,7 +185,6 @@
<description>
Indicates if anonymous requests are allowed when using 'simple' 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" update="false" delete="false"/>
</property>
</configuration>