http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/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 ebe9738..7326170 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 @@ -19,6 +19,7 @@ * limitations under the License. */ --> + <configuration supports_adding_forbidden="true"> <!-- hadoop-env.sh --> <property> @@ -29,20 +30,16 @@ <value-attributes> <type>string</type> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> <property> <name>keyserver_port</name> - <value/> + <value></value> <display-name>Key Server Port</display-name> <description>Port number where Key Management Server is available</description> <value-attributes> <type>int</type> <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>content</name> @@ -147,7 +144,7 @@ export HADOOP_IDENT_STRING=$USER # Add database libraries JAVA_JDBC_LIBS="" if [ -d "/usr/share/java" ]; then - for jarFile in `ls /usr/share/java | grep -E "(mysql|ojdbc|postgresql|sqljdbc)" 2>/dev/null` + for jarFile in `ls /usr/share/java | grep -E "(mysql|ojdbc|postgresql|sqljdbc)" 2>/dev/null` do JAVA_JDBC_LIBS=${JAVA_JDBC_LIBS}:$jarFile done @@ -178,7 +175,7 @@ export HADOOP_OPTS="-Dhdp.version=$HDP_VERSION $HADOOP_OPTS" {% if is_datanode_max_locked_memory_set %} # Fix temporary bug, when ulimit from conf files is not picked up, without full relogin. # Makes sense to fix only when runing DN as root -if [ "$command" == "datanode" ] && [ "$EUID" -eq 0 ] && [ -n "$HADOOP_SECURE_DN_USER" ]; then +if [ "$command" == "datanode" ] && [ "$EUID" -eq 0 ] && [ -n "$HADOOP_SECURE_DN_USER" ]; then ulimit -l {{datanode_max_locked_memory}} fi {% endif %} @@ -186,7 +183,6 @@ fi <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/3148759f/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 366e1cf..a21ec4e 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 @@ -19,7 +19,9 @@ * limitations under the License. */ --> + <configuration supports_final="false" supports_adding_forbidden="true"> + <property> <name>content</name> <display-name>hdfs-log4j template</display-name> @@ -220,7 +222,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="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/3148759f/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 1d68391..178f436 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 @@ -1,5 +1,6 @@ <?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 @@ -16,39 +17,38 @@ 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"> + <property> <name>dfs.namenode.startup.delay.block.deletion.sec</name> <value>3600</value> - <description/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> + <description></description> </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="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="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="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>dfs.content-summary.limit</name> <value>5000</value> <description>Dfs content summary limit.</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>dfs.encryption.key.provider.uri</name> - <value/> + <value></value> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -70,7 +70,6 @@ <name>ranger.service.https.attrib.ssl.enabled</name> </property> </depends-on> - <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/3148759f/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 cc302c6..d8ab47a 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 @@ -11,289 +11,259 @@ License for the specific language governing permissions and * limitations under the License. */ --> <configuration supports_final="true"> - <property> - <name>policy_user</name> - <value>ambari-qa</value> - <display-name>Policy user for HDFS</display-name> - <description>This user must be system user and also present at Ranger + + <property> + <name>policy_user</name> + <value>ambari-qa</value> + <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="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> - <property> - <name>hadoop.rpc.protection</name> - <value/> - <description>Used for repository creation on ranger admin + </property> + + <property> + <name>hadoop.rpc.protection</name> + <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/> - <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-hdfs-plugin-enabled</name> - <value>No</value> - <display-name>Enable Ranger for HDFS</display-name> - <description>Enable ranger hdfs plugin</description> - <depends-on> - <property> - <type>ranger-env</type> - <name>ranger-hdfs-plugin-enabled</name> - </property> - </depends-on> - <value-attributes> - <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>hadoop</value> - <display-name>Ranger repository config user</display-name> - <description>Used for repository creation on ranger admin + <value-attributes> + <empty-value-valid>true</empty-value-valid> + </value-attributes> + </property> + + <property> + <name>common.name.for.certificate</name> + <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> + </property> + + <property> + <name>ranger-hdfs-plugin-enabled</name> + <value>No</value> + <display-name>Enable Ranger for HDFS</display-name> + <description>Enable ranger hdfs plugin</description> + <depends-on> + <property> + <type>ranger-env</type> + <name>ranger-hdfs-plugin-enabled</name> + </property> + </depends-on> + <value-attributes> + <type>boolean</type> + <overridable>false</overridable> + </value-attributes> + </property> + + <property> + <name>REPOSITORY_CONFIG_USERNAME</name> + <value>hadoop</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>hadoop</value> - <display-name>Ranger repository config password</display-name> - <property-type>PASSWORD</property-type> - <description>Used for repository creation on ranger admin + </property> + + <property> + <name>REPOSITORY_CONFIG_PASSWORD</name> + <value>hadoop</value> + <display-name>Ranger repository config password</display-name> + <property-type>PASSWORD</property-type> + <description>Used for repository creation on ranger admin </description> - <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>XAAUDIT.DB.IS_ENABLED</name> - <value>true</value> - <display-name>Audit to DB</display-name> - <description/> - <value-attributes> - <type>boolean</type> - </value-attributes> - <depends-on> - <property> - <type>ranger-env</type> - <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>XAAUDIT.HDFS.IS_ENABLED</name> - <value>false</value> - <display-name>Audit to HDFS</display-name> - <description/> - <value-attributes> - <type>boolean</type> - </value-attributes> - <depends-on> - <property> - <type>ranger-env</type> - <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>XAAUDIT.HDFS.DESTINATION_DIRECTORY</name> - <value>hdfs://localhost:8020/ranger/audit/%app-type%/%time:yyyyMMdd%</value> + <value-attributes> + <type>password</type> + </value-attributes> + </property> + + <property> + <name>XAAUDIT.DB.IS_ENABLED</name> + <value>true</value> + <display-name>Audit to DB</display-name> + <description></description> + <value-attributes> + <type>boolean</type> + </value-attributes> + <depends-on> + <property> + <type>ranger-env</type> + <name>xasecure.audit.destination.db</name> + </property> + </depends-on> + </property> + + <property> + <name>XAAUDIT.HDFS.IS_ENABLED</name> + <value>false</value> + <display-name>Audit to HDFS</display-name> + <description></description> + <value-attributes> + <type>boolean</type> + </value-attributes> + <depends-on> + <property> + <type>ranger-env</type> + <name>xasecure.audit.destination.hdfs</name> + </property> + </depends-on> + </property> + + <property> + <name>XAAUDIT.HDFS.DESTINATION_DIRECTORY</name> + <value>hdfs://localhost:8020/ranger/audit/%app-type%/%time:yyyyMMdd%</value> <property-type>DONT_ADD_ON_UPGRADE</property-type> - <description/> - <depends-on> - <property> - <type>ranger-env</type> - <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>XAAUDIT.HDFS.LOCAL_BUFFER_DIRECTORY</name> - <value>__REPLACE__LOG_DIR/hadoop/%app-type%/audit</value> - <description/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> - <property> - <name>XAAUDIT.HDFS.LOCAL_ARCHIVE_DIRECTORY</name> - <value>__REPLACE__LOG_DIR/hadoop/%app-type%/audit/archive</value> - <description/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> - <property> - <name>XAAUDIT.HDFS.DESTINTATION_FILE</name> - <value>%hostname%-audit.log</value> - <description/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> - <property> - <name>XAAUDIT.HDFS.DESTINTATION_FLUSH_INTERVAL_SECONDS</name> - <value>900</value> - <description/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> - <property> - <name>XAAUDIT.HDFS.DESTINTATION_ROLLOVER_INTERVAL_SECONDS</name> - <value>86400</value> - <description/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> - <property> - <name>XAAUDIT.HDFS.DESTINTATION_OPEN_RETRY_INTERVAL_SECONDS</name> - <value>60</value> - <description/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> - <property> - <name>XAAUDIT.HDFS.LOCAL_BUFFER_FILE</name> - <value>%time:yyyyMMdd-HHmm.ss%.log</value> - <description/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> - <property> - <name>XAAUDIT.HDFS.LOCAL_BUFFER_FLUSH_INTERVAL_SECONDS</name> - <value>60</value> - <description/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> - <property> - <name>XAAUDIT.HDFS.LOCAL_BUFFER_ROLLOVER_INTERVAL_SECONDS</name> - <value>600</value> - <description/> - <on-ambari-upgrade add="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> - <value>10</value> - <description/> - <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>SSL_KEYSTORE_FILE_PATH</name> - <value>/etc/hadoop/conf/ranger-plugin-keystore.jks</value> - <description/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> - <property> - <name>SSL_KEYSTORE_PASSWORD</name> - <value>myKeyFilePassword</value> - <property-type>PASSWORD</property-type> - <description/> - <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>SSL_TRUSTSTORE_FILE_PATH</name> - <value>/etc/hadoop/conf/ranger-plugin-truststore.jks</value> - <description/> - <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> - <value>changeit</value> - <property-type>PASSWORD</property-type> - <description/> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> - <property> - <name>POLICY_MGR_URL</name> - <value>{{policymgr_mgr_url}}</value> - <description>Policy Manager url</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> - <property> - <name>SQL_CONNECTOR_JAR</name> - <value>{{sql_connector_jar}}</value> - <description>Location of DB client library (please check the location + <description></description> + <depends-on> + <property> + <type>ranger-env</type> + <name>xasecure.audit.destination.hdfs.dir</name> + </property> + </depends-on> + </property> + + <property> + <name>XAAUDIT.HDFS.LOCAL_BUFFER_DIRECTORY</name> + <value>__REPLACE__LOG_DIR/hadoop/%app-type%/audit</value> + <description></description> + </property> + + <property> + <name>XAAUDIT.HDFS.LOCAL_ARCHIVE_DIRECTORY</name> + <value>__REPLACE__LOG_DIR/hadoop/%app-type%/audit/archive</value> + <description></description> + </property> + + <property> + <name>XAAUDIT.HDFS.DESTINTATION_FILE</name> + <value>%hostname%-audit.log</value> + <description></description> + </property> + + <property> + <name>XAAUDIT.HDFS.DESTINTATION_FLUSH_INTERVAL_SECONDS</name> + <value>900</value> + <description></description> + </property> + + <property> + <name>XAAUDIT.HDFS.DESTINTATION_ROLLOVER_INTERVAL_SECONDS</name> + <value>86400</value> + <description></description> + </property> + + <property> + <name>XAAUDIT.HDFS.DESTINTATION_OPEN_RETRY_INTERVAL_SECONDS</name> + <value>60</value> + <description></description> + </property> + + <property> + <name>XAAUDIT.HDFS.LOCAL_BUFFER_FILE</name> + <value>%time:yyyyMMdd-HHmm.ss%.log</value> + <description></description> + </property> + + <property> + <name>XAAUDIT.HDFS.LOCAL_BUFFER_FLUSH_INTERVAL_SECONDS</name> + <value>60</value> + <description></description> + </property> + + <property> + <name>XAAUDIT.HDFS.LOCAL_BUFFER_ROLLOVER_INTERVAL_SECONDS</name> + <value>600</value> + <description></description> + </property> + + <property> + <name>XAAUDIT.HDFS.LOCAL_ARCHIVE_MAX_FILE_COUNT</name> + <value>10</value> + <description></description> + <value-attributes> + <type>password</type> + </value-attributes> + </property> + + <property> + <name>SSL_KEYSTORE_FILE_PATH</name> + <value>/etc/hadoop/conf/ranger-plugin-keystore.jks</value> + <description></description> + </property> + + <property> + <name>SSL_KEYSTORE_PASSWORD</name> + <value>myKeyFilePassword</value> + <property-type>PASSWORD</property-type> + <description></description> + <value-attributes> + <type>password</type> + </value-attributes> + </property> + + <property> + <name>SSL_TRUSTSTORE_FILE_PATH</name> + <value>/etc/hadoop/conf/ranger-plugin-truststore.jks</value> + <description></description> + </property> + + <property> + <name>SSL_TRUSTSTORE_PASSWORD</name> + <value>changeit</value> + <property-type>PASSWORD</property-type> + <description></description> + </property> + + <property> + <name>POLICY_MGR_URL</name> + <value>{{policymgr_mgr_url}}</value> + <description>Policy Manager url</description> + </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="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> - <property> - <name>XAAUDIT.DB.FLAVOUR</name> - <value>{{xa_audit_db_flavor}}</value> - <description>The database type to be used (mysql/oracle)</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> - <property> - <name>XAAUDIT.DB.DATABASE_NAME</name> - <value>{{xa_audit_db_name}}</value> - <description>Audit database name</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> - <property> - <name>XAAUDIT.DB.USER_NAME</name> - <value>{{xa_audit_db_user}}</value> - <description>Audit database user</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> - <property> - <name>XAAUDIT.DB.PASSWORD</name> - <value>{{xa_audit_db_password}}</value> - <property-type>PASSWORD</property-type> - <description>Audit database password</description> - <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>XAAUDIT.DB.HOSTNAME</name> - <value>{{xa_db_host}}</value> - <description>Audit database hostname</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> - <property> - <name>REPOSITORY_NAME</name> - <value>{{repo_name}}</value> - <description>Ranger repository name</description> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> - </property> -</configuration> + </property> + + <property> + <name>XAAUDIT.DB.FLAVOUR</name> + <value>{{xa_audit_db_flavor}}</value> + <description>The database type to be used (mysql/oracle)</description> + </property> + + <property> + <name>XAAUDIT.DB.DATABASE_NAME</name> + <value>{{xa_audit_db_name}}</value> + <description>Audit database name</description> + </property> + + <property> + <name>XAAUDIT.DB.USER_NAME</name> + <value>{{xa_audit_db_user}}</value> + <description>Audit database user</description> + </property> + + <property> + <name>XAAUDIT.DB.PASSWORD</name> + <value>{{xa_audit_db_password}}</value> + <property-type>PASSWORD</property-type> + <description>Audit database password</description> + <value-attributes> + <type>password</type> + </value-attributes> + </property> + + <property> + <name>XAAUDIT.DB.HOSTNAME</name> + <value>{{xa_db_host}}</value> + <description>Audit database hostname</description> + </property> + + <property> + <name>REPOSITORY_NAME</name> + <value>{{repo_name}}</value> + <description>Ranger repository name</description> + </property> + +</configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/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 7285527..1beca9d 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 @@ -19,6 +19,7 @@ * limitations under the License. */ --> + <configuration supports_adding_forbidden="true"> <property> <name>hive.heapsize</name> @@ -33,9 +34,8 @@ <increment-step>512</increment-step> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <!-- hive-env.sh --> <property> <name>content</name> @@ -88,9 +88,8 @@ export METASTORE_PORT={{hive_metastore_port}} <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> + <property> <name>hive_exec_orc_storage_strategy</name> <display-name>ORC Storage Strategy</display-name> @@ -109,9 +108,8 @@ export METASTORE_PORT={{hive_metastore_port}} </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>hive_txn_acid</name> <display-name>ACID Transactions</display-name> @@ -130,9 +128,8 @@ export METASTORE_PORT={{hive_metastore_port}} </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>hive_security_authorization</name> <display-name>Choose Authorization</display-name> @@ -160,9 +157,8 @@ export METASTORE_PORT={{hive_metastore_port}} </entry> </entries> </value-attributes> - <on-ambari-upgrade add="true" change="false" delete="false"/> - <on-stack-upgrade add="true" change="false" delete="false"/> </property> + <property> <name>hive_timeline_logging_enabled</name> <display-name>Use ATS Logging</display-name> @@ -181,7 +177,6 @@ export METASTORE_PORT={{hive_metastore_port}} </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> + </configuration>
