http://git-wip-us.apache.org/repos/asf/ambari/blob/a998371a/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/configuration/oozie-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/configuration/oozie-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/configuration/oozie-site.xml index 1da1589..86becf9 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/configuration/oozie-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/configuration/oozie-site.xml @@ -41,8 +41,7 @@ <value-attributes> <type>custom</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.service.ELService.ext.functions.coord-action-create-inst</name> @@ -69,8 +68,7 @@ <value-attributes> <type>custom</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.service.ELService.ext.functions.coord-action-create</name> @@ -97,8 +95,7 @@ <value-attributes> <type>custom</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.service.ELService.ext.functions.coord-job-submit-data</name> @@ -126,8 +123,7 @@ <value-attributes> <type>custom</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.service.ELService.ext.functions.coord-action-start</name> @@ -157,8 +153,7 @@ <value-attributes> <type>custom</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.service.ELService.ext.functions.coord-sla-submit</name> @@ -172,8 +167,7 @@ <value-attributes> <type>custom</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.service.ELService.ext.functions.coord-sla-create</name> @@ -187,8 +181,7 @@ <value-attributes> <type>custom</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.service.HadoopAccessorService.supported.filesystems</name> @@ -199,7 +192,6 @@ <value-attributes> <type>custom</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/a998371a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml index a0eb6bc..2962549 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml @@ -29,8 +29,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>hbase_pid_dir</name> @@ -42,8 +41,7 @@ <overridable>false</overridable> <editable-only-at-install>true</editable-only-at-install> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" update="false" delete="false"/> </property> <property> <name>hbase_regionserver_xmn_max</name> @@ -57,16 +55,14 @@ and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value. <value-attributes> <unit>MB</unit> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" update="false" delete="false"/> </property> <property> <name>hbase_regionserver_xmn_ratio</name> <value>0.2</value> <display-name>RegionServers -Xmn in -Xmx ratio</display-name> <description>Percentage of max heap size (-Xmx) which used for young generation heap (-Xmn).</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>hbase_user</name> @@ -78,8 +74,7 @@ and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value. <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>hbase_max_direct_memory_size</name> @@ -89,8 +84,7 @@ and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value. <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>phoenix_sql_enabled</name> @@ -111,8 +105,7 @@ and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value. </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" update="false" delete="false"/> </property> <!-- hbase-env.sh --> <property> @@ -194,7 +187,6 @@ export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS {% if hbase_max_direct_ <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/a998371a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml index 0510a84..1c3eb6e 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml @@ -26,8 +26,7 @@ <description>A staging directory in default file system (HDFS) for bulk loading. </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>hbase.hstore.flush.retries.number</name> @@ -36,8 +35,7 @@ <description> The number of times the region flush operation will be retried. </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>hbase.hregion.majorcompaction</name> @@ -56,8 +54,7 @@ <maximum>2592000000</maximum> <unit>milliseconds</unit> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" update="false" delete="false"/> </property> <property> <name>hbase.hregion.majorcompaction.jitter</name> @@ -66,8 +63,7 @@ a given amount of time either side of hbase.hregion.majorcompaction. The smaller the number, the closer the compactions will happen to the hbase.hregion.majorcompaction interval.</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>hbase.hregion.memstore.block.multiplier</name> @@ -95,8 +91,7 @@ </entry> </entries> </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>hbase.bucketcache.ioengine</name> @@ -106,8 +101,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" update="false" delete="false"/> </property> <property> <name>hbase.bucketcache.size</name> @@ -116,8 +110,7 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" update="false" delete="false"/> </property> <property> <name>hbase.bucketcache.percentage.in.combinedcache</name> @@ -126,8 +119,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>hbase.regionserver.wal.codec</name> @@ -139,8 +131,7 @@ <name>phoenix_sql_enabled</name> </property> </depends-on> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" update="false" delete="false"/> </property> <property> <name>hbase.region.server.rpc.scheduler.factory.class</name> @@ -154,8 +145,7 @@ <name>phoenix_sql_enabled</name> </property> </depends-on> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" update="false" delete="false"/> </property> <property> <name>hbase.rpc.controllerfactory.class</name> @@ -169,8 +159,7 @@ <name>phoenix_sql_enabled</name> </property> </depends-on> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" update="false" delete="false"/> </property> <property> <name>phoenix.functions.allowUserDefinedFunctions</name> @@ -181,8 +170,7 @@ <name>phoenix_sql_enabled</name> </property> </depends-on> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" update="false" delete="false"/> </property> <property> <name>hbase.coprocessor.regionserver.classes</name> @@ -196,8 +184,7 @@ <name>hbase.security.authorization</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>hbase.hstore.compaction.max</name> @@ -238,8 +225,7 @@ </entry> </entries> </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>hbase.regionserver.global.memstore.size</name> @@ -256,8 +242,7 @@ <maximum>0.8</maximum> <increment-step>0.01</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>hbase.coprocessor.master.classes</name> @@ -282,8 +267,7 @@ <name>ranger-hbase-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> <property> <name>hbase.coprocessor.region.classes</name> @@ -311,8 +295,7 @@ <name>ranger-hbase-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> <property> <name>hbase.security.authorization</name> @@ -339,7 +322,6 @@ <name>ranger-hbase-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/a998371a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/ranger-hbase-plugin-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/ranger-hbase-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/ranger-hbase-plugin-properties.xml index c99ec90..628e782 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/ranger-hbase-plugin-properties.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/ranger-hbase-plugin-properties.xml @@ -26,16 +26,14 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" update="false" delete="false"/> </property> <property> <name>policy_user</name> <value>ambari-qa</value> <display-name>Policy user for HBASE</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>ranger-hbase-plugin-enabled</name> @@ -52,16 +50,14 @@ <name>ranger-hbase-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> <property> <name>REPOSITORY_CONFIG_USERNAME</name> <value>hbase</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,8 +68,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>XAAUDIT.DB.IS_ENABLED</name> @@ -89,8 +84,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> @@ -106,8 +100,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> @@ -120,71 +113,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> @@ -193,15 +176,13 @@ <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> @@ -211,23 +192,20 @@ <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_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> <value>changeit</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>UPDATE_XAPOLICIES_ON_GRANT_REVOKE</name> @@ -237,43 +215,37 @@ <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>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> @@ -283,21 +255,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/a998371a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/core-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/core-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/core-site.xml index 4c603bb..a103184 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/core-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/core-site.xml @@ -22,8 +22,7 @@ <name>hadoop.http.authentication.simple.anonymous.allowed</name> <value>true</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>hadoop.security.key.provider.path</name> @@ -49,7 +48,6 @@ <name>ranger.service.https.attrib.ssl.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/a998371a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml index 0978595..fc1f487 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hadoop-env.xml @@ -29,8 +29,7 @@ <value-attributes> <type>string</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>keyserver_port</name> @@ -41,8 +40,7 @@ <type>int</type> <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>content</name> @@ -186,7 +184,6 @@ fi <value-attributes> <type>content</type> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" update="false" delete="false"/> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/a998371a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-log4j.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-log4j.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-log4j.xml index ff7810f..1a6849d 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-log4j.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-log4j.xml @@ -220,7 +220,6 @@ log4j.logger.org.apache.hadoop.conf.Configuration.deprecation=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/a998371a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml index a932bab..b5bff5a 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml @@ -22,29 +22,25 @@ <name>dfs.namenode.startup.delay.block.deletion.sec</name> <value>3600</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>dfs.journalnode.edits.dir</name> <value>/hadoop/hdfs/journalnode</value> <description>The path where the JournalNode daemon will store its local state. </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>dfs.client.retry.policy.enabled</name> <value>false</value> <description>Enables HDFS client retry in the event of a NameNode failure.</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>dfs.content-summary.limit</name> <value>5000</value> <description>Dfs content summary limit.</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>dfs.encryption.key.provider.uri</name> @@ -70,7 +66,6 @@ <name>ranger.service.https.attrib.ssl.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/a998371a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/ranger-hdfs-plugin-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/ranger-hdfs-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/ranger-hdfs-plugin-properties.xml index 8aa79a8..4c51f55 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/ranger-hdfs-plugin-properties.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/ranger-hdfs-plugin-properties.xml @@ -17,8 +17,7 @@ <display-name>Policy user for HDFS</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>hadoop.rpc.protection</name> @@ -28,8 +27,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>common.name.for.certificate</name> @@ -38,8 +36,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-hdfs-plugin-enabled</name> @@ -56,8 +53,7 @@ <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> @@ -65,8 +61,7 @@ <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> @@ -78,8 +73,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>XAAUDIT.DB.IS_ENABLED</name> @@ -95,8 +89,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> @@ -112,8 +105,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> @@ -126,71 +118,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> @@ -199,15 +181,13 @@ <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> @@ -217,59 +197,51 @@ <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_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> <value>changeit</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>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> @@ -279,21 +251,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/a998371a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-env.xml index 6f256bc..40c48f9 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-env.xml @@ -33,8 +33,7 @@ <increment-step>512</increment-step> <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> <!-- hive-env.sh --> <property> @@ -88,8 +87,7 @@ export METASTORE_PORT={{hive_metastore_port}} <value-attributes> <type>content</type> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" update="false" delete="false"/> </property> <property> <name>hive_exec_orc_storage_strategy</name> @@ -109,8 +107,7 @@ export METASTORE_PORT={{hive_metastore_port}} </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" update="false" delete="false"/> </property> <property> <name>hive_txn_acid</name> @@ -130,8 +127,7 @@ export METASTORE_PORT={{hive_metastore_port}} </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" update="false" delete="false"/> </property> <property> <name>hive_security_authorization</name> @@ -160,8 +156,7 @@ export METASTORE_PORT={{hive_metastore_port}} </entry> </entries> </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>hive_timeline_logging_enabled</name> @@ -181,7 +176,6 @@ export METASTORE_PORT={{hive_metastore_port}} </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="false" change="true" delete="true"/> - <on-stack-upgrade add="true" change="true" delete="false"/> + <on-ambari-upgrade add="true" update="false" delete="false"/> </property> </configuration>