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/01 15:26:53 UTC
[70/94] ambari git commit: AMBARI-16272. Ambari Upgrade shouldn't
automatically add stack configs (dlysnichenko)
http://git-wip-us.apache.org/repos/asf/ambari/blob/98d86419/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-audit.xml
index 67c705b..b985252 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-audit.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-audit.xml
@@ -19,13 +19,13 @@
*/
-->
<configuration>
-
<property>
<name>xasecure.audit.is.enabled</name>
<value>true</value>
<description>Is Audit enabled?</description>
+ <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>
<value>false</value>
@@ -40,20 +40,23 @@
<name>xasecure.audit.destination.db</name>
</property>
</depends-on>
+ <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="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="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>xasecure.audit.destination.db.password</name>
<value>crypted</value>
@@ -62,26 +65,30 @@
<value-attributes>
<type>password</type>
</value-attributes>
+ <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="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="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/hive/audit/db/spool</value>
<description>/var/log/hive/audit/db/spool</description>
- </property>
-
+ <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>
<value>true</value>
@@ -96,8 +103,9 @@
<name>xasecure.audit.destination.hdfs</name>
</property>
</depends-on>
+ <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>
<value>hdfs://NAMENODE_HOSTNAME:8020/ranger/audit</value>
@@ -108,14 +116,16 @@
<name>xasecure.audit.destination.hdfs.dir</name>
</property>
</depends-on>
+ <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/hive/audit/hdfs/spool</value>
<description>/var/log/hive/audit/hdfs/spool</description>
+ <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>
<value>false</value>
@@ -130,11 +140,12 @@
<name>xasecure.audit.destination.solr</name>
</property>
</depends-on>
+ <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>
- <value></value>
+ <value/>
<description>Solr URL</description>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
@@ -145,8 +156,9 @@
<name>ranger.audit.solr.urls</name>
</property>
</depends-on>
+ <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>
<value>NONE</value>
@@ -157,14 +169,16 @@
<name>ranger.audit.solr.zookeepers</name>
</property>
</depends-on>
+ <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/hive/audit/solr/spool</value>
<description>/var/log/hive/audit/solr/spool</description>
+ <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>
<value>false</value>
@@ -173,6 +187,7 @@
<value-attributes>
<type>boolean</type>
</value-attributes>
+ <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/98d86419/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-plugin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-plugin-properties.xml
index 64f85c7..cf8eae2 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-plugin-properties.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-plugin-properties.xml
@@ -19,135 +19,160 @@
*/
-->
<configuration supports_final="true">
-
<property>
<name>XAAUDIT.DB.IS_ENABLED</name>
<deleted>true</deleted>
- </property>
-
+ <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>
<deleted>true</deleted>
+ <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>
<deleted>true</deleted>
+ <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>
<deleted>true</deleted>
+ <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>
<deleted>true</deleted>
+ <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>
<deleted>true</deleted>
+ <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>
<deleted>true</deleted>
+ <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>
<deleted>true</deleted>
+ <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>
<deleted>true</deleted>
+ <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>
<deleted>true</deleted>
+ <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>
<deleted>true</deleted>
+ <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>
<deleted>true</deleted>
+ <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>
<deleted>true</deleted>
+ <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>
<deleted>true</deleted>
+ <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>
<deleted>true</deleted>
+ <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>
<deleted>true</deleted>
+ <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>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>UPDATE_XAPOLICIES_ON_GRANT_REVOKE</name>
<deleted>true</deleted>
+ <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>
- <deleted>true</deleted>
- </property>
-
+ <deleted>true</deleted>
+ <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>
- <deleted>true</deleted>
- </property>
-
+ <deleted>true</deleted>
+ <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>
- <deleted>true</deleted>
- </property>
-
+ <deleted>true</deleted>
+ <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>
- <deleted>true</deleted>
- </property>
-
+ <deleted>true</deleted>
+ <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>
- <deleted>true</deleted>
- </property>
-
+ <deleted>true</deleted>
+ <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>
- <deleted>true</deleted>
+ <deleted>true</deleted>
+ <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>
- <deleted>true</deleted>
+ <deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>REPOSITORY_NAME</name>
- <deleted>true</deleted>
+ <deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/98d86419/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-policymgr-ssl.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-policymgr-ssl.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-policymgr-ssl.xml
index a8599b3..a996d00 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-policymgr-ssl.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-policymgr-ssl.xml
@@ -19,13 +19,13 @@
*/
-->
<configuration>
-
<property>
<name>xasecure.policymgr.clientssl.keystore</name>
<value>/usr/hdp/current/hive-server2/conf/ranger-plugin-keystore.jks</value>
<description>Java Keystore files</description>
+ <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>
<value>myKeyFilePassword</value>
@@ -34,14 +34,16 @@
<value-attributes>
<type>password</type>
</value-attributes>
+ <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>/usr/hdp/current/hive-server2/conf/ranger-plugin-truststore.jks</value>
<description>java truststore file</description>
+ <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>
<value>changeit</value>
@@ -50,18 +52,21 @@
<value-attributes>
<type>password</type>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
- <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="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="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/98d86419/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-security.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-security.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-security.xml
index 1072747..c5c6fff 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-security.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-security.xml
@@ -19,43 +19,48 @@
*/
-->
<configuration>
-
<property>
<name>ranger.plugin.hive.service.name</name>
<value>{{repo_name}}</value>
<description>Name of the Ranger service containing policies for this HIVE instance</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>ranger.plugin.hive.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="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>ranger.plugin.hive.policy.rest.url</name>
<value>{{policymgr_mgr_url}}</value>
<description>URL to Ranger Admin</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>ranger.plugin.hive.policy.rest.ssl.config.file</name>
<value>/usr/hdp/current/hive-server2/conf/conf.server/ranger-policymgr-ssl.xml</value>
<description>Path to the file containing SSL details to contact Ranger Admin</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>ranger.plugin.hive.policy.pollIntervalMs</name>
<value>30000</value>
<description>How often to poll for changes in policies?</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>ranger.plugin.hive.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="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>xasecure.hive.update.xapolicies.on.grant.revoke</name>
<value>true</value>
@@ -64,6 +69,7 @@
<value-attributes>
<type>boolean</type>
</value-attributes>
+ <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/98d86419/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/webhcat-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/webhcat-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/webhcat-site.xml
index d3962d2..a636865 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/webhcat-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/webhcat-site.xml
@@ -16,19 +16,17 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<!-- The default settings for Templeton. -->
<!-- Edit templeton-site.xml to change settings for your local -->
<!-- install. -->
-
<configuration supports_final="true">
-
<property>
<name>templeton.libjars</name>
<value>/usr/hdp/${hdp.version}/zookeeper/zookeeper.jar,/usr/hdp/${hdp.version}/hive/lib/hive-common.jar</value>
<description>Jars to add the the classpath.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>templeton.hive.extra.files</name>
<value>/usr/hdp/${hdp.version}/tez/conf/tez-site.xml,/usr/hdp/${hdp.version}/tez,/usr/hdp/${hdp.version}/tez/lib</value>
@@ -40,7 +38,7 @@ limitations under the License.
This can be used to specify config files, Tez artifacts, etc. This will be sent -files option of hadoop jar command thus
each path is interpreted by Generic Option Parser. It can be local or hdfs path.
</description>
+ <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/98d86419/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-policymgr-ssl.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-policymgr-ssl.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-policymgr-ssl.xml
index 3d14e1f..80b2d92 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-policymgr-ssl.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-policymgr-ssl.xml
@@ -19,17 +19,18 @@
*/
-->
<configuration>
-
<property>
<name>xasecure.policymgr.clientssl.keystore</name>
<value>/usr/hdp/current/kafka-broker/config/ranger-plugin-keystore.jks</value>
<description>Java Keystore files</description>
+ <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>/usr/hdp/current/kafka-broker/config/ranger-plugin-truststore.jks</value>
<description>java truststore file</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/98d86419/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/knoxsso-topology.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/knoxsso-topology.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/knoxsso-topology.xml
index 4ce17a4..91be6e9 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/knoxsso-topology.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/knoxsso-topology.xml
@@ -19,11 +19,9 @@
* limitations under the License.
*/
-->
-
<configuration supports_final="false" supports_adding_forbidden="true">
- <!-- topology file -->
-
- <property>
+ <!-- topology file -->
+ <property>
<name>content</name>
<display-name>knoxsso-topology template</display-name>
<value>
@@ -87,9 +85,11 @@
The configuration specifies the KnoxSSO provider integration, cookie and token management details.
</description>
<value-attributes>
- <type>content</type>
- <empty-value-valid>true</empty-value-valid>
- <show-property-name>false</show-property-name>
+ <type>content</type>
+ <empty-value-valid>true</empty-value-valid>
+ <show-property-name>false</show-property-name>
</value-attributes>
- </property>
+ <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/98d86419/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-audit.xml
index 94614c1..648f624 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-audit.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-audit.xml
@@ -19,13 +19,13 @@
*/
-->
<configuration>
-
<property>
<name>xasecure.audit.is.enabled</name>
<value>true</value>
<description>Is Audit enabled?</description>
+ <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>
<value>false</value>
@@ -40,20 +40,23 @@
<name>xasecure.audit.destination.db</name>
</property>
</depends-on>
+ <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="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="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>xasecure.audit.destination.db.password</name>
<value>crypted</value>
@@ -62,26 +65,30 @@
<value-attributes>
<type>password</type>
</value-attributes>
+ <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="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="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/knox/audit/db/spool</value>
<description>/var/log/knox/audit/db/spool</description>
- </property>
-
+ <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>
<value>true</value>
@@ -96,8 +103,9 @@
<name>xasecure.audit.destination.hdfs</name>
</property>
</depends-on>
+ <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>
<value>hdfs://NAMENODE_HOSTNAME:8020/ranger/audit</value>
@@ -108,14 +116,16 @@
<name>xasecure.audit.destination.hdfs.dir</name>
</property>
</depends-on>
+ <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/knox/audit/hdfs/spool</value>
<description>/var/log/knox/audit/hdfs/spool</description>
+ <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>
<value>false</value>
@@ -130,11 +140,12 @@
<name>xasecure.audit.destination.solr</name>
</property>
</depends-on>
+ <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>
- <value></value>
+ <value/>
<description>Solr URL</description>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
@@ -145,8 +156,9 @@
<name>ranger.audit.solr.urls</name>
</property>
</depends-on>
+ <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>
<value>NONE</value>
@@ -157,14 +169,16 @@
<name>ranger.audit.solr.zookeepers</name>
</property>
</depends-on>
+ <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/knox/audit/solr/spool</value>
<description>/var/log/knox/audit/solr/spool</description>
+ <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>
<value>false</value>
@@ -173,6 +187,7 @@
<value-attributes>
<type>boolean</type>
</value-attributes>
+ <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/98d86419/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-plugin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-plugin-properties.xml
index 99cc8fc..83301b3 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-plugin-properties.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-plugin-properties.xml
@@ -19,130 +19,154 @@
*/
-->
<configuration supports_final="true">
-
<property>
<name>XAAUDIT.DB.IS_ENABLED</name>
<deleted>true</deleted>
+ <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>
<deleted>true</deleted>
+ <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>
<deleted>true</deleted>
+ <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>
<deleted>true</deleted>
+ <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>
<deleted>true</deleted>
+ <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>
<deleted>true</deleted>
+ <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>
<deleted>true</deleted>
+ <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>
<deleted>true</deleted>
+ <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>
<deleted>true</deleted>
+ <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>
<deleted>true</deleted>
+ <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>
<deleted>true</deleted>
+ <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>
<deleted>true</deleted>
+ <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>
<deleted>true</deleted>
+ <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>
<deleted>true</deleted>
+ <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>
<deleted>true</deleted>
+ <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>
<deleted>true</deleted>
+ <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>
<deleted>true</deleted>
+ <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>
- <deleted>true</deleted>
- </property>
-
+ <deleted>true</deleted>
+ <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>
- <deleted>true</deleted>
- </property>
-
+ <deleted>true</deleted>
+ <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>
- <deleted>true</deleted>
- </property>
-
+ <deleted>true</deleted>
+ <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>
- <deleted>true</deleted>
- </property>
-
+ <deleted>true</deleted>
+ <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>
- <deleted>true</deleted>
- </property>
-
+ <deleted>true</deleted>
+ <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>
- <deleted>true</deleted>
+ <deleted>true</deleted>
+ <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>
- <deleted>true</deleted>
+ <deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>REPOSITORY_NAME</name>
- <deleted>true</deleted>
+ <deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/98d86419/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-policymgr-ssl.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-policymgr-ssl.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-policymgr-ssl.xml
index 5e1c90e..c813cfd 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-policymgr-ssl.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-policymgr-ssl.xml
@@ -19,13 +19,13 @@
*/
-->
<configuration>
-
<property>
<name>xasecure.policymgr.clientssl.keystore</name>
<value>/usr/hdp/current/knox-server/conf/ranger-plugin-keystore.jks</value>
<description>Java Keystore files</description>
+ <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>
<value>myKeyFilePassword</value>
@@ -34,14 +34,16 @@
<value-attributes>
<type>password</type>
</value-attributes>
+ <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>/usr/hdp/current/knox-server/conf/ranger-plugin-truststore.jks</value>
<description>java truststore file</description>
+ <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>
<value>changeit</value>
@@ -50,18 +52,21 @@
<value-attributes>
<type>password</type>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
- <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="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="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/98d86419/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-security.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-security.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-security.xml
index 5bfb259..a449b74 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-security.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-security.xml
@@ -19,41 +19,46 @@
*/
-->
<configuration>
-
<property>
<name>ranger.plugin.knox.service.name</name>
<value>{{repo_name}}</value>
<description>Name of the Ranger service containing policies for this Knox instance</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>ranger.plugin.knox.policy.source.impl</name>
<value>org.apache.ranger.admin.client.RangerAdminJersey2RESTClient</value>
<description>Class to retrieve policies from the source</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>ranger.plugin.knox.policy.rest.url</name>
<value>{{policymgr_mgr_url}}</value>
<description>URL to Ranger Admin</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>ranger.plugin.knox.policy.rest.ssl.config.file</name>
<value>/usr/hdp/current/knox-server/conf/ranger-policymgr-ssl.xml</value>
<description>Path to the file containing SSL details to contact Ranger Admin</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>ranger.plugin.knox.policy.pollIntervalMs</name>
<value>30000</value>
<description>How often to poll for changes in policies?</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>ranger.plugin.knox.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="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/98d86419/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/configuration/oozie-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/configuration/oozie-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/configuration/oozie-env.xml
index 29e95df..194de6f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/configuration/oozie-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/configuration/oozie-env.xml
@@ -19,9 +19,7 @@
* limitations under the License.
*/
-->
-
<configuration supports_adding_forbidden="true">
-
<!-- oozie-env.sh -->
<property>
<name>content</name>
@@ -107,6 +105,7 @@ export HADOOP_OPTS="-Dhdp.version=${HDP_VERSION} ${HADOOP_OPTS}"
<value-attributes>
<type>content</type>
</value-attributes>
+ <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/98d86419/ambari-server/src/main/resources/stacks/HDP/2.3/services/PIG/configuration/pig-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/PIG/configuration/pig-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/PIG/configuration/pig-properties.xml
index 6e4942b..1928ace 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/PIG/configuration/pig-properties.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/PIG/configuration/pig-properties.xml
@@ -19,9 +19,7 @@
* limitations under the License.
*/
-->
-
<configuration supports_final="false" supports_adding_forbidden="true">
-
<property>
<name>content</name>
<display-name>pig-properties template</display-name>
@@ -636,6 +634,7 @@ pig.tez.grace.parallelism=true
<empty-value-valid>true</empty-value-valid>
<show-property-name>false</show-property-name>
</value-attributes>
+ <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/98d86419/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-ugsync-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-ugsync-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-ugsync-site.xml
index a739128..923b6d1 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-ugsync-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-ugsync-site.xml
@@ -15,34 +15,36 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<configuration supports_final="true">
-
<property>
<name>ranger.usersync.keystore.file</name>
<value>/usr/hdp/current/ranger-usersync/conf/unixauthservice.jks</value>
<description>Keystore file used for usersync</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>ranger.usersync.truststore.file</name>
<value>/usr/hdp/current/ranger-usersync/conf/mytruststore.jks</value>
<description>Truststore used for usersync, required if usersync -> ranger admin communication is SSL enabled</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>ranger.usersync.ldap.bindkeystore</name>
- <value></value>
+ <value/>
<description>Set same value as ranger.usersync.keystore.file property i.e default value /usr/hdp/current/ranger-usersync/conf/ugsync.jceks</description>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>ranger.usersync.credstore.filename</name>
<value>/usr/hdp/current/ranger-usersync/conf/ugsync.jceks</value>
<description>Credential store file name for user sync, specify full path</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
-</configuration>
+</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/98d86419/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER_KMS/configuration/ranger-kms-policymgr-ssl.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER_KMS/configuration/ranger-kms-policymgr-ssl.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER_KMS/configuration/ranger-kms-policymgr-ssl.xml
index 5f8c3bd..9af9292 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER_KMS/configuration/ranger-kms-policymgr-ssl.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER_KMS/configuration/ranger-kms-policymgr-ssl.xml
@@ -19,17 +19,18 @@
*/
-->
<configuration>
-
<property>
<name>xasecure.policymgr.clientssl.keystore</name>
<value>/usr/hdp/current/ranger-kms/conf/ranger-plugin-keystore.jks</value>
<description>Java Keystore files</description>
+ <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>/usr/hdp/current/ranger-kms/conf/ranger-plugin-truststore.jks</value>
<description>java truststore file</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/98d86419/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-policymgr-ssl.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-policymgr-ssl.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-policymgr-ssl.xml
index b2d979e..961bd5d 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-policymgr-ssl.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-policymgr-ssl.xml
@@ -19,17 +19,18 @@
*/
-->
<configuration>
-
<property>
<name>xasecure.policymgr.clientssl.keystore</name>
<value>/usr/hdp/current/storm-client/conf/ranger-plugin-keystore.jks</value>
<description>Java Keystore files</description>
+ <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>/usr/hdp/current/storm-client/conf/ranger-plugin-truststore.jks</value>
<description>java truststore file</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/98d86419/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-security.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-security.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-security.xml
index f2c3bb7..60bb521 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-security.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-security.xml
@@ -19,11 +19,11 @@
*/
-->
<configuration>
-
<property>
<name>ranger.plugin.storm.policy.rest.ssl.config.file</name>
<value>/usr/hdp/current/storm-client/conf/ranger-policymgr-ssl.xml</value>
<description>Path to the file containing SSL details to contact Ranger Admin</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/98d86419/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-site.xml
index 3a871ac..86b7796 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/storm-site.xml
@@ -17,8 +17,7 @@
* limitations under the License.
*/
-->
-
-<configuration supports_final="true" xmlns:xi="http://www.w3.org/2001/XInclude">
+<configuration xmlns:xi="http://www.w3.org/2001/XInclude" supports_final="true">
<property>
<name>java.library.path</name>
<value>/usr/local/lib:/opt/local/lib:/usr/lib:/usr/hdp/current/storm-client/lib</value>
@@ -26,8 +25,9 @@
for the java.library.path value. java.library.path tells the JVM where
to look for native libraries. It is necessary to set this config correctly since
Storm uses the ZeroMQ and JZMQ native libs. </description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>nimbus.childopts</name>
<value>-Xmx1024m _JAAS_PLACEHOLDER -javaagent:/usr/hdp/current/storm-nimbus/contrib/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=localhost,port=8649,wireformat31x=true,mode=multicast,config=/usr/hdp/current/storm-nimbus/contrib/storm-jmxetric/conf/jmxetric-conf.xml,process=Nimbus_JVM</value>
@@ -35,8 +35,9 @@
<value-attributes>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>worker.childopts</name>
<value>-Xmx768m _JAAS_PLACEHOLDER -javaagent:/usr/hdp/current/storm-client/contrib/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=localhost,port=8650,wireformat31x=true,mode=multicast,config=/usr/hdp/current/storm-client/contrib/storm-jmxetric/conf/jmxetric-conf.xml,process=Worker_%ID%_JVM</value>
@@ -44,8 +45,9 @@
<value-attributes>
<type>multiLine</type>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>supervisor.childopts</name>
<value>-Xmx256m _JAAS_PLACEHOLDER -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.port={{jmxremote_port}} -javaagent:/usr/hdp/current/storm-supervisor/contrib/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=localhost,port=8650,wireformat31x=true,mode=multicast,config=/usr/hdp/current/storm-supervisor/contrib/storm-jmxetric/conf/jmxetric-conf.xml,process=Supervisor_JVM</value>
@@ -53,6 +55,7 @@
<value-attributes>
<overridable>false</overridable>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/98d86419/ambari-server/src/main/resources/stacks/HDP/2.3/services/TEZ/configuration/tez-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/TEZ/configuration/tez-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/TEZ/configuration/tez-site.xml
index b2db250..a746471 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/TEZ/configuration/tez-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/TEZ/configuration/tez-site.xml
@@ -16,7 +16,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<configuration supports_final="true">
<property>
<name>tez.am.view-acls</name>
@@ -27,8 +26,9 @@
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>tez.runtime.optimize.local.fetch</name>
<value>true</value>
@@ -36,8 +36,9 @@
<value-attributes>
<type>boolean</type>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>tez.task.generate.counters.per.io</name>
<value>true</value>
@@ -45,8 +46,9 @@
<value-attributes>
<type>boolean</type>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>tez.runtime.sorter.class</name>
<value>PIPELINED</value>
@@ -65,8 +67,9 @@
</entries>
<selection-cardinality>1</selection-cardinality>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>tez.runtime.pipelined.sorter.sort.threads</name>
<value>2</value>
@@ -80,8 +83,9 @@
<name>tez.runtime.sorter.class</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>tez.runtime.io.sort.mb</name>
<value>272</value>
@@ -96,23 +100,27 @@
<name>tez.runtime.sorter.class</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>tez.history.logging.service.class</name>
<value>org.apache.tez.dag.history.logging.ats.ATSV15HistoryLoggingService</value>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>tez.counters.max</name>
<value>10000</value>
<description>The number of allowed counters for the executing DAG</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>tez.counters.max.groups</name>
<value>3000</value>
<description>The number of allowed counter groups for the executing DAG</description>
+ <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/98d86419/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration-mapred/mapred-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration-mapred/mapred-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration-mapred/mapred-site.xml
index bd5a911..71fdf54 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration-mapred/mapred-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration-mapred/mapred-site.xml
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -17,11 +16,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<!-- Put site-specific property overrides in this file. -->
-
-<configuration supports_final="true" xmlns:xi="http://www.w3.org/2001/XInclude">
-
+<configuration xmlns:xi="http://www.w3.org/2001/XInclude" supports_final="true">
<property>
<name>mapreduce.jobhistory.recovery.enable</name>
<value>true</value>
@@ -29,22 +25,25 @@
server state upon startup. If enabled then
mapreduce.jobhistory.recovery.store.class must be specified.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>mapreduce.jobhistory.recovery.store.class</name>
<value>org.apache.hadoop.mapreduce.v2.hs.HistoryServerLeveldbStateStoreService</value>
<description>The HistoryServerStateStoreService class to store history server
state for recovery.
</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>mapreduce.jobhistory.recovery.store.leveldb.path</name>
<value>/hadoop/mapreduce/jhs</value>
<description>The URI where history server state will be stored if HistoryServerLeveldbSystemStateStoreService
is configured as the recovery storage class.
</description>
+ <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/98d86419/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/capacity-scheduler.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/capacity-scheduler.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/capacity-scheduler.xml
index f680b5b..54241ee 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/capacity-scheduler.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/capacity-scheduler.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,12 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<configuration supports_final="false">
-
<property>
<name>yarn.scheduler.capacity.root.default-node-label-expression</name>
<deleted>true</deleted>
+ <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/98d86419/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-audit.xml
index fb7c120..7aaf43b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-audit.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-audit.xml
@@ -19,13 +19,13 @@
*/
-->
<configuration>
-
<property>
<name>xasecure.audit.is.enabled</name>
<value>true</value>
<description>Is Audit enabled?</description>
+ <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>
<value>false</value>
@@ -40,20 +40,23 @@
<name>xasecure.audit.destination.db</name>
</property>
</depends-on>
+ <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="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="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>xasecure.audit.destination.db.password</name>
<value>crypted</value>
@@ -62,26 +65,30 @@
<value-attributes>
<type>password</type>
</value-attributes>
+ <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="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="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/hadoop/yarn/audit/db/spool</value>
<description>/var/log/hadoop/yarn/audit/db/spool</description>
- </property>
-
+ <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>
<value>true</value>
@@ -96,8 +103,9 @@
<name>xasecure.audit.destination.hdfs</name>
</property>
</depends-on>
+ <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>
<value>hdfs://NAMENODE_HOSTNAME:8020/ranger/audit</value>
@@ -108,14 +116,16 @@
<name>xasecure.audit.destination.hdfs.dir</name>
</property>
</depends-on>
+ <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/hadoop/yarn/audit/hdfs/spool</value>
<description>/var/log/hadoop/yarn/audit/hdfs/spool</description>
+ <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>
<value>false</value>
@@ -130,11 +140,12 @@
<name>xasecure.audit.destination.solr</name>
</property>
</depends-on>
+ <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>
- <value></value>
+ <value/>
<description>Solr URL</description>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
@@ -145,8 +156,9 @@
<name>ranger.audit.solr.urls</name>
</property>
</depends-on>
+ <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>
<value>NONE</value>
@@ -157,14 +169,16 @@
<name>ranger.audit.solr.zookeepers</name>
</property>
</depends-on>
+ <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/hadoop/yarn/audit/solr/spool</value>
<description>/var/log/hadoop/yarn/audit/solr/spool</description>
+ <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>
<value>false</value>
@@ -173,6 +187,7 @@
<value-attributes>
<type>boolean</type>
</value-attributes>
- </property>
-
+ <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/98d86419/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-plugin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-plugin-properties.xml
index f0c5946..48f116f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-plugin-properties.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-plugin-properties.xml
@@ -19,32 +19,34 @@
*/
-->
<configuration supports_final="true">
-
<property>
<name>policy_user</name>
<value>ambari-qa</value>
<display-name>Policy user for YARN</display-name>
<description>This user must be system user and also present at Ranger admin portal</description>
- </property>
-
+ <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>
- <value></value>
+ <value/>
<description>Used for repository creation on ranger admin</description>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
+ <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>
- <value></value>
+ <value/>
<description>Common name for certificate, this value should match what is specified in repo within ranger admin</description>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>ranger-yarn-plugin-enabled</name>
<value>No</value>
@@ -60,15 +62,17 @@
<type>boolean</type>
<overridable>false</overridable>
</value-attributes>
+ <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>yarn</value>
<display-name>Ranger repository config user</display-name>
<description>Used for repository creation on ranger admin</description>
+ <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>
<value>yarn</value>
@@ -78,6 +82,7 @@
<value-attributes>
<type>password</type>
</value-attributes>
- </property>
-
+ <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/98d86419/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-policymgr-ssl.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-policymgr-ssl.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-policymgr-ssl.xml
index 755b050..01e2bf4 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-policymgr-ssl.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-policymgr-ssl.xml
@@ -19,13 +19,13 @@
*/
-->
<configuration>
-
<property>
<name>xasecure.policymgr.clientssl.keystore</name>
<value>/usr/hdp/current/hadoop-client/conf/ranger-yarn-plugin-keystore.jks</value>
<description>Java Keystore files</description>
+ <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>
<value>myKeyFilePassword</value>
@@ -34,14 +34,16 @@
<value-attributes>
<type>password</type>
</value-attributes>
+ <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>/usr/hdp/current/hadoop-client/conf/ranger-yarn-plugin-truststore.jks</value>
<description>java truststore file</description>
+ <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>
<value>changeit</value>
@@ -50,18 +52,21 @@
<value-attributes>
<type>password</type>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
- <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="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="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/98d86419/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-security.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-security.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-security.xml
index 59d81ae..eee528f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-security.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-security.xml
@@ -19,41 +19,46 @@
*/
-->
<configuration>
-
<property>
<name>ranger.plugin.yarn.service.name</name>
<value>{{repo_name}}</value>
<description>Name of the Ranger service containing policies for this Yarn instance</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>ranger.plugin.yarn.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="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>ranger.plugin.yarn.policy.rest.url</name>
<value>{{policymgr_mgr_url}}</value>
<description>URL to Ranger Admin</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>ranger.plugin.yarn.policy.rest.ssl.config.file</name>
<value>/etc/hadoop/conf/ranger-policymgr-ssl-yarn.xml</value>
<description>Path to the file containing SSL details to contact Ranger Admin</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>ranger.plugin.yarn.policy.pollIntervalMs</name>
<value>30000</value>
<description>How often to poll for changes in policies?</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>ranger.plugin.yarn.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="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/98d86419/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml
index 9454056..3ed9095 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml
@@ -19,11 +19,12 @@
*/
-->
<configuration supports_final="true" supports_adding_forbidden="true">
-
<property>
<name>is_supported_yarn_ranger</name>
<value>true</value>
<description>Set to false by default, needs to be set to true in stacks that use Ranger Yarn Plugin</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<!-- yarn-env.sh -->
<property>
@@ -155,5 +156,7 @@
<value-attributes>
<type>content</type>
</value-attributes>
+ <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/98d86419/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml
index 1ad508d..6a5d2ed 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml
@@ -19,9 +19,7 @@
* limitations under the License.
*/
-->
-
<configuration supports_final="false" supports_adding_forbidden="true">
-
<property>
<name>content</name>
<display-name>yarn-log4j template</display-name>
@@ -100,6 +98,7 @@ log4j.appender.NMAUDIT.DatePattern=.yyyy-MM-dd
<type>content</type>
<show-property-name>false</show-property-name>
</value-attributes>
+ <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/98d86419/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml
index 8b6709d..8f05d57 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-site.xml
@@ -16,21 +16,20 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<!-- Put site-specific property overrides in this file. -->
-
-<configuration supports_final="true" xmlns:xi="http://www.w3.org/2001/XInclude">
-
+<configuration xmlns:xi="http://www.w3.org/2001/XInclude" supports_final="true">
<property>
<name>yarn.node-labels.manager-class</name>
<deleted>true</deleted>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>yarn.timeline-service.recovery.enabled</name>
<value>true</value>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>yarn.acl.enable</name>
<value>false</value>
@@ -41,8 +40,9 @@
<name>ranger-yarn-plugin-enabled</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>yarn.authorization-provider</name>
<description> Yarn authorization provider class. </description>
@@ -52,8 +52,9 @@
<name>ranger-yarn-plugin-enabled</name>
</property>
</depends-on>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-
<property>
<name>yarn.admin.acl</name>
<value>yarn</value>
@@ -61,55 +62,75 @@
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<!--ats v1.5 properties-->
<property>
<name>yarn.timeline-service.version</name>
<value>1.5</value>
- <description>Timeline service version we\u2019re currently using.</description>
+ <description>Timeline service version we’re currently using.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>yarn.timeline-service.store-class</name>
<value>org.apache.hadoop.yarn.server.timeline.EntityGroupFSTimelineStore</value>
<description>Main storage class for YARN timeline server.</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>yarn.timeline-service.entity-group-fs-store.active-dir</name>
<value>/ats/active/</value>
- <description>DFS path to store active application\u2019s timeline data</description>
+ <description>DFS path to store active application’s timeline data</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>yarn.timeline-service.entity-group-fs-store.done-dir</name>
<value>/ats/done/</value>
- <description>DFS path to store done application\u2019s timeline data</description>
+ <description>DFS path to store done application’s timeline data</description>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>yarn.timeline-service.entity-group-fs-store.group-id-plugin-classes</name>
- <value></value>
+ <value/>
<description>Plugins that can translate a timeline entity read request into a list of timeline cache ids, separated by commas. </description>
<value-attributes>
<empty-value-valid>true</empty-value-valid>
</value-attributes>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<!-- advanced ats v1.5 properties-->
<property>
<name>yarn.timeline-service.entity-group-fs-store.summary-store</name>
<!-- Use rolling leveldb, advanced -->
<value>org.apache.hadoop.yarn.server.timeline.RollingLevelDBTimelineStore</value>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>yarn.timeline-service.entity-group-fs-store.scan-interval-seconds</name>
<!-- Default is 60 seconds, advanced -->
<value>60</value>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>yarn.timeline-service.entity-group-fs-store.cleaner-interval-seconds</name>
<!-- 3600 is default, advanced -->
<value>3600</value>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
<property>
<name>yarn.timeline-service.entity-group-fs-store.retain-seconds</name>
<!-- 7 days is default, advanced -->
<value>604800</value>
+ <on-ambari-upgrade add="true" change="false" delete="false"/>
+ <on-stack-upgrade add="true" change="false" delete="false"/>
</property>
-</configuration>
\ No newline at end of file
+</configuration>