http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/FLUME/package/templates/log4j.properties.j2
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/FLUME/package/templates/log4j.properties.j2
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/FLUME/package/templates/log4j.properties.j2
deleted file mode 100644
index 3b34db8..0000000
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/FLUME/package/templates/log4j.properties.j2
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#  http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, 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.
-#
-
-# Define some default values that can be overridden by system properties.
-#
-# For testing, it may also be convenient to specify
-# -Dflume.root.logger=DEBUG,console when launching flume.
-
-#flume.root.logger=DEBUG,console
-flume.root.logger=INFO,LOGFILE
-flume.log.dir={{flume_log_dir}}
-flume.log.file=flume-{{agent_name}}.log
-
-log4j.logger.org.apache.flume.lifecycle = INFO
-log4j.logger.org.jboss = WARN
-log4j.logger.org.mortbay = INFO
-log4j.logger.org.apache.avro.ipc.NettyTransceiver = WARN
-log4j.logger.org.apache.hadoop = INFO
-
-# Define the root logger to the system property "flume.root.logger".
-log4j.rootLogger=${flume.root.logger}
-
-
-# Stock log4j rolling file appender
-# Default log rotation configuration
-log4j.appender.LOGFILE=org.apache.log4j.RollingFileAppender
-log4j.appender.LOGFILE.MaxFileSize=100MB
-log4j.appender.LOGFILE.MaxBackupIndex=10
-log4j.appender.LOGFILE.File=${flume.log.dir}/${flume.log.file}
-log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout
-log4j.appender.LOGFILE.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss,SSS} 
%-5p [%t] (%C.%M:%L) %x - %m%n
-
-
-# Warning: If you enable the following appender it will fill up your disk if 
you don't have a cleanup job!
-# This uses the updated rolling file appender from log4j-extras that supports 
a reliable time-based rolling policy.
-# See 
http://logging.apache.org/log4j/companions/extras/apidocs/org/apache/log4j/rolling/TimeBasedRollingPolicy.html
-# Add "DAILY" to flume.root.logger above if you want to use this
-log4j.appender.DAILY=org.apache.log4j.rolling.RollingFileAppender
-log4j.appender.DAILY.rollingPolicy=org.apache.log4j.rolling.TimeBasedRollingPolicy
-log4j.appender.DAILY.rollingPolicy.ActiveFileName=${flume.log.dir}/${flume.log.file}
-log4j.appender.DAILY.rollingPolicy.FileNamePattern=${flume.log.dir}/${flume.log.file}.%d{yyyy-MM-dd}
-log4j.appender.DAILY.layout=org.apache.log4j.PatternLayout
-log4j.appender.DAILY.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss,SSS} 
%-5p [%t] (%C.%M:%L) %x - %m%n
-
-
-# console
-# Add "console" to flume.root.logger above if you want to use this
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.target=System.err
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d (%t) [%p - %l] %m%n

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/alerts.json
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/alerts.json
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/alerts.json
deleted file mode 100644
index 834c8fb..0000000
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/alerts.json
+++ /dev/null
@@ -1,157 +0,0 @@
-{
-  "HBASE": {
-    "service": [
-      {
-        "name": "hbase_regionserver_process_percent",
-        "label": "Percent RegionServers Available",
-        "description": "This service-level alert is triggered if the 
configured percentage of RegionServer processes cannot be determined to be up 
and listening on the network for the configured warning and critical 
thresholds. It aggregates the results of RegionServer process down checks.",
-        "interval": 1,
-        "scope": "SERVICE",
-        "enabled": true,
-        "source": {
-          "type": "AGGREGATE",
-          "alert_name": "hbase_regionserver_process",
-          "reporting": {
-            "ok": {
-              "text": "affected: [{1}], total: [{0}]"
-            },
-            "warning": {
-              "text": "affected: [{1}], total: [{0}]",
-              "value": 0.1
-            },
-            "critical": {
-              "text": "affected: [{1}], total: [{0}]",
-              "value": 0.3
-            }
-          }
-        }
-      }    
-    ],
-    "HBASE_MASTER": [
-      {
-        "name": "hbase_master_process",
-        "label": "HBase Master Process",
-        "description": "This alert is triggered if the HBase master processes 
cannot be confirmed to be up and listening on the network for the configured 
critical threshold, given in seconds.",
-        "interval": 1,
-        "scope": "ANY",
-        "source": {
-          "type": "PORT",
-          "uri": "{{hbase-site/hbase.master.port}}",
-          "default_port": 16000,
-          "reporting": {
-            "ok": {
-              "text": "TCP OK - {0:.3f}s response on port {1}"
-            },
-            "warning": {
-              "text": "TCP OK - {0:.3f}s response on port {1}",
-              "value": 1.5
-            },
-            "critical": {
-              "text": "Connection failed: {0} to {1}:{2}",
-              "value": 5.0
-            }
-          }
-        }
-      },
-      {
-        "name": "hbase_master_cpu",
-        "label": "HBase Maser CPU Utilization",
-        "description": "This host-level alert is triggered if CPU utilization 
of the HBase Master exceeds certain warning and critical thresholds. It checks 
the HBase Master JMX Servlet for the SystemCPULoad property. The threshold 
values are in percent.",
-        "interval": 5,
-        "scope": "ANY",
-        "enabled": true,
-        "source": {
-          "type": "METRIC",
-          "uri": {
-            "http": "{{hbase-site/hbase.master.info.port}}",
-            "default_port": 16010
-          },
-          "reporting": {
-            "ok": {
-              "text": "{1} CPU, load {0:.1%}"
-            },
-            "warning": {
-              "text": "{1} CPU, load {0:.1%}",
-              "value": 200
-            },
-            "critical": {
-              "text": "{1} CPU, load {0:.1%}",
-              "value": 250
-            },
-            "units" : "%"
-          },
-          "jmx": {
-            "property_list": [
-              "java.lang:type=OperatingSystem/SystemCpuLoad",
-              "java.lang:type=OperatingSystem/AvailableProcessors"
-            ],
-            "value": "{0} * 100"
-          }
-        }
-      },
-      {
-        "name": "regionservers_health_summary",
-        "label": "RegionServers Health Summary",
-        "description": "This service-level alert is triggered if there are 
unhealthy RegionServers",
-        "interval": 1,
-        "scope": "SERVICE",
-        "enabled": true,
-        "source": {
-          "type": "METRIC",
-          "uri": {
-            "http": "{{hbase-site/hbase.master.info.port}}",
-            "default_port": 16010
-          },
-          "reporting": {
-            "ok": {
-              "text": "All {1} RegionServer(s) are alive"
-            },
-            "warning": {
-              "text": "Dead RegionServer(s): {0} out of {1}",
-              "value": 1
-            },
-            "critical": {
-              "text": "Dead RegionServer(s): {0} out of {1}",
-              "value": 1
-            },
-            "units" : "RegionServer(s)"
-          },
-          "jmx": {
-            "property_list": [
-              
"Hadoop:service=HBase,name=Master,sub=Server/numDeadRegionServers",
-              "Hadoop:service=HBase,name=Master,sub=Server/numRegionServers"
-            ],
-            "value": "{0}"
-          }
-        }
-      }
-    ],
-    "HBASE_REGIONSERVER": [
-      {
-        "name": "hbase_regionserver_process",
-        "label": "HBase RegionServer Process",
-        "description": "This host-level alert is triggered if the RegionServer 
processes cannot be confirmed to be up and listening on the network for the 
configured critical threshold, given in seconds.",
-        "interval": 1,
-        "scope": "HOST",
-        "source": {
-          "type": "PORT",
-          "uri": "{{hbase-site/hbase.regionserver.info.port}}",
-          "default_port": 16030,
-          "reporting": {
-            "ok": {
-              "text": "TCP OK - {0:.3f}s response on port {1}"
-            },
-            "warning": {
-              "text": "TCP OK - {0:.3f}s response on port {1}",
-              "value": 1.5
-            },
-            "critical": {
-              "text": "Connection failed: {0} to {1}:{2}",
-              "value": 5.0
-            }
-          }
-        }
-      }
-    ]
-  }
-}

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/hbase-env.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/hbase-env.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/hbase-env.xml
deleted file mode 100644
index 495bbda..0000000
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/hbase-env.xml
+++ /dev/null
@@ -1,196 +0,0 @@
-<?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 this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * 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.
- */
--->
-
-<configuration>
-  <property>
-    <name>hbase_log_dir</name>
-    <display-name>HBase Log Dir Prefix</display-name>
-    <value>/var/log/hbase</value>
-    <description>Log Directories for HBase.</description>
-    <value-attributes>
-      <type>directory</type>
-      <overridable>false</overridable>
-      <editable-only-at-install>true</editable-only-at-install>
-    </value-attributes>
-  </property>
-  <property>
-    <name>hbase_pid_dir</name>
-    <display-name>HBase PID Dir</display-name>
-    <value>/var/run/hbase</value>
-    <description>Pid Directory for HBase.</description>
-    <value-attributes>
-      <type>directory</type>
-      <overridable>false</overridable>
-      <editable-only-at-install>true</editable-only-at-install>
-    </value-attributes>
-  </property>
-  <property>
-    <name>hbase_regionserver_heapsize</name>
-    <value>4096</value>
-    <description>Maximum amount of memory each HBase RegionServer can 
use.</description>
-    <display-name>HBase RegionServer Maximum Memory</display-name>
-    <value-attributes>
-      <type>int</type>
-      <minimum>1024</minimum>
-      <maximum>6554</maximum>
-      <unit>MB</unit>
-      <increment-step>256</increment-step>
-    </value-attributes>
-  </property>
-  <property>
-    <name>hbase_regionserver_xmn_max</name>
-    <value>512</value>
-    <description> Sets the upper bound on HBase RegionServers' young 
generation size.
-               This value is used in case the young generation size (-Xmn) 
calculated based on the max heapsize (hbase_regionserver_heapsize)
-               and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this 
value.
-    </description>
-    <display-name>RegionServers maximum value for -Xmn</display-name>
-    <value-attributes>
-      <type>int</type>
-      <unit>MB</unit>
-    </value-attributes>
-  </property>
-  <property>
-    <name>hbase_regionserver_xmn_ratio</name>
-    <display-name>RegionServers -Xmn in -Xmx ratio</display-name>
-    <value>0.2</value>
-    <description>Percentage of max heap size (-Xmx) which used for young 
generation heap (-Xmn).</description>
-    <value-attributes>
-      <type>float</type>
-    </value-attributes>
-  </property>
-  <property>
-    <name>hbase_master_heapsize</name>
-    <value>4096</value>
-    <description>Maximum amount of memory each HBase Master can 
use.</description>
-    <display-name>HBase Master Maximum Memory</display-name>
-    <value-attributes>
-      <type>int</type>
-      <minimum>1024</minimum>
-      <maximum>16384</maximum>
-      <unit>MB</unit>
-      <increment-step>256</increment-step>
-    </value-attributes>
-  </property>
-   <property>
-    <name>hbase_user</name>
-    <value>hbase</value>
-    <property-type>USER</property-type>
-    <description>HBase User Name.</description>
-  </property>
-  <property>
-    <name>phoenix_sql_enabled</name>
-    <value>false</value>
-    <description>Enable Phoenix SQL</description>
-    <display-name>Enable Phoenix</display-name>
-    <value-attributes>
-      <type>value-list</type>
-      <entries>
-        <entry>
-          <value>true</value>
-          <label>Enabled</label>
-        </entry>
-        <entry>
-          <value>false</value>
-          <label>Disabled</label>
-        </entry>
-      </entries>
-      <selection-cardinality>1</selection-cardinality>
-    </value-attributes>
-  </property>
-  
-  <!-- hbase-env.sh -->
-  <property>
-    <name>content</name>
-    <description>This is the jinja template for hbase-env.sh file</description>
-    <value>
-# Set environment variables here.
-
-# The java implementation to use. Java 1.6 required.
-export JAVA_HOME={{java64_home}}
-
-# HBase Configuration directory
-export HBASE_CONF_DIR=${HBASE_CONF_DIR:-{{hbase_conf_dir}}}
-
-# Extra Java CLASSPATH elements. Optional.
-export HBASE_CLASSPATH=${HBASE_CLASSPATH}
-
-# The maximum amount of heap to use, in MB. Default is 1000.
-# export HBASE_HEAPSIZE=1000
-
-# Extra Java runtime options.
-# Below are what we set by default. May only work with SUN JVM.
-# For more on why as well as other possible settings,
-# see http://wiki.apache.org/hadoop/PerformanceTuning
-export SERVER_GC_OPTS="-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps 
-Xloggc:{{log_dir}}/gc.log-`date +'%Y%m%d%H%M'`"
-# Uncomment below to enable java garbage collection logging.
-# export HBASE_OPTS="$HBASE_OPTS -verbose:gc -XX:+PrintGCDetails 
-XX:+PrintGCDateStamps -Xloggc:$HBASE_HOME/logs/gc-hbase.log"
-
-# Uncomment and adjust to enable JMX exporting
-# See jmxremote.password and jmxremote.access in $JRE_HOME/lib/management to 
configure remote password access.
-# More details at: 
http://java.sun.com/javase/6/docs/technotes/guides/management/agent.html
-#
-# export HBASE_JMX_BASE="-Dcom.sun.management.jmxremote.ssl=false 
-Dcom.sun.management.jmxremote.authenticate=false"
-# If you want to configure BucketCache, specify '-XX: MaxDirectMemorySize=' 
with proper direct memory size
-# export HBASE_THRIFT_OPTS="$HBASE_JMX_BASE 
-Dcom.sun.management.jmxremote.port=10103"
-# export HBASE_ZOOKEEPER_OPTS="$HBASE_JMX_BASE 
-Dcom.sun.management.jmxremote.port=10104"
-
-# File naming hosts on which HRegionServers will run. 
$HBASE_HOME/conf/regionservers by default.
-export HBASE_REGIONSERVERS=${HBASE_CONF_DIR}/regionservers
-
-# Extra ssh options. Empty by default.
-# export HBASE_SSH_OPTS="-o ConnectTimeout=1 -o SendEnv=HBASE_CONF_DIR"
-
-# Where log files are stored. $HBASE_HOME/logs by default.
-export HBASE_LOG_DIR={{log_dir}}
-
-# A string representing this instance of hbase. $USER by default.
-# export HBASE_IDENT_STRING=$USER
-
-# The scheduling priority for daemon processes. See 'man nice'.
-# export HBASE_NICENESS=10
-
-# The directory where pid files are stored. /tmp by default.
-export HBASE_PID_DIR={{pid_dir}}
-
-# Seconds to sleep between slave commands. Unset by default. This
-# can be useful in large clusters, where, e.g., slave rsyncs can
-# otherwise arrive faster than the master can service them.
-# export HBASE_SLAVE_SLEEP=0.1
-
-# Tell HBase whether it should manage it's own instance of Zookeeper or not.
-export HBASE_MANAGES_ZK=false
-
-{% if security_enabled %}
-export HBASE_OPTS="$HBASE_OPTS -XX:+UseConcMarkSweepGC 
-XX:ErrorFile={{log_dir}}/hs_err_pid%p.log 
-Djava.security.auth.login.config={{client_jaas_config_file}}"
-export HBASE_MASTER_OPTS="$HBASE_MASTER_OPTS -Xmx{{master_heapsize}} 
-Djava.security.auth.login.config={{master_jaas_config_file}}"
-export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS 
-Xmn{{regionserver_xmn_size}} -XX:CMSInitiatingOccupancyFraction=70  
-Xms{{regionserver_heapsize}} -Xmx{{regionserver_heapsize}} 
-Djava.security.auth.login.config={{regionserver_jaas_config_file}}"
-export PHOENIX_QUERYSERVER_OPTS="$PHOENIX_QUERYSERVER_OPTS 
-Djava.security.auth.login.config={{queryserver_jaas_config_file}}"
-{% else %}
-export HBASE_OPTS="$HBASE_OPTS -XX:+UseConcMarkSweepGC 
-XX:ErrorFile={{log_dir}}/hs_err_pid%p.log"
-export HBASE_MASTER_OPTS="$HBASE_MASTER_OPTS -Xmx{{master_heapsize}}"
-export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS 
-Xmn{{regionserver_xmn_size}} -XX:CMSInitiatingOccupancyFraction=70  
-Xms{{regionserver_heapsize}} -Xmx{{regionserver_heapsize}}"
-{% endif %}
-    </value>
-  </property>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/hbase-javaopts-properties.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/hbase-javaopts-properties.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/hbase-javaopts-properties.xml
deleted file mode 100644
index 3e94791..0000000
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/hbase-javaopts-properties.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * 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.
- */
--->
-<configuration supports_final="true">
-  <property>
-    <name>content</name>
-    <description>Hbase-javaopts-properties</description>
-    <value> </value>
-  </property>
-</configuration>
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/hbase-log4j.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/hbase-log4j.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/hbase-log4j.xml
deleted file mode 100644
index 63e4564..0000000
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/hbase-log4j.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?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 this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * 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.
- */
--->
-
-<configuration supports_final="false">
-
-  <property>
-    <name>content</name>
-    <description>Custom log4j.properties</description>
-    <value>
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
-
-
-# Define some default values that can be overridden by system properties
-hbase.root.logger=INFO,console
-hbase.security.logger=INFO,console
-hbase.log.dir=.
-hbase.log.file=hbase.log
-
-# Define the root logger to the system property "hbase.root.logger".
-log4j.rootLogger=${hbase.root.logger}
-
-# Logging Threshold
-log4j.threshold=ALL
-
-#
-# Daily Rolling File Appender
-#
-log4j.appender.DRFA=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.DRFA.File=${hbase.log.dir}/${hbase.log.file}
-
-# Rollver at midnight
-log4j.appender.DRFA.DatePattern=.yyyy-MM-dd
-
-# 30-day backup
-#log4j.appender.DRFA.MaxBackupIndex=30
-log4j.appender.DRFA.layout=org.apache.log4j.PatternLayout
-
-# Pattern format: Date LogLevel LoggerName LogMessage
-log4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{2}: %m%n
-
-# Rolling File Appender properties
-hbase.log.maxfilesize=256MB
-hbase.log.maxbackupindex=20
-
-# Rolling File Appender
-log4j.appender.RFA=org.apache.log4j.RollingFileAppender
-log4j.appender.RFA.File=${hbase.log.dir}/${hbase.log.file}
-
-log4j.appender.RFA.MaxFileSize=${hbase.log.maxfilesize}
-log4j.appender.RFA.MaxBackupIndex=${hbase.log.maxbackupindex}
-
-log4j.appender.RFA.layout=org.apache.log4j.PatternLayout
-log4j.appender.RFA.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{2}: %m%n
-
-#
-# Security audit appender
-#
-hbase.security.log.file=SecurityAuth.audit
-hbase.security.log.maxfilesize=256MB
-hbase.security.log.maxbackupindex=20
-log4j.appender.RFAS=org.apache.log4j.RollingFileAppender
-log4j.appender.RFAS.File=${hbase.log.dir}/${hbase.security.log.file}
-log4j.appender.RFAS.MaxFileSize=${hbase.security.log.maxfilesize}
-log4j.appender.RFAS.MaxBackupIndex=${hbase.security.log.maxbackupindex}
-log4j.appender.RFAS.layout=org.apache.log4j.PatternLayout
-log4j.appender.RFAS.layout.ConversionPattern=%d{ISO8601} %p %c: %m%n
-log4j.category.SecurityLogger=${hbase.security.logger}
-log4j.additivity.SecurityLogger=false
-log4j.logger.SecurityLogger.org.apache.hadoop.hbase.security.access.AccessController=TRACE
-
-#
-# Null Appender
-#
-log4j.appender.NullAppender=org.apache.log4j.varia.NullAppender
-
-#
-# console
-# Add "console" to rootlogger above if you want to use this
-#
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.target=System.err
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{2}: 
%m%n
-
-# Custom Logging levels
-
-log4j.logger.org.apache.zookeeper=INFO
-#log4j.logger.org.apache.hadoop.fs.FSNamesystem=DEBUG
-log4j.logger.org.apache.hadoop.hbase=INFO
-# Make these two classes INFO-level. Make them DEBUG to see more zk debug.
-log4j.logger.org.apache.hadoop.hbase.zookeeper.ZKUtil=INFO
-log4j.logger.org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher=INFO
-#log4j.logger.org.apache.hadoop.dfs=DEBUG
-# Set this class to log INFO only otherwise its OTT
-# Enable this to get detailed connection error/retry logging.
-# 
log4j.logger.org.apache.hadoop.hbase.client.HConnectionManager$HConnectionImplementation=TRACE
-
-
-# Uncomment this line to enable tracing on _every_ RPC call (this can be a lot 
of output)
-#log4j.logger.org.apache.hadoop.ipc.HBaseServer.trace=DEBUG
-
-# Uncomment the below if you want to remove logging of client region caching'
-# and scan of .META. messages
-# 
log4j.logger.org.apache.hadoop.hbase.client.HConnectionManager$HConnectionImplementation=INFO
-# log4j.logger.org.apache.hadoop.hbase.client.MetaScanner=INFO
-
-    </value>
-    <value-attributes>
-      <show-property-name>false</show-property-name>
-    </value-attributes>
-  </property>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/hbase-policy.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/hbase-policy.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/hbase-policy.xml
deleted file mode 100644
index 2f12801..0000000
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/hbase-policy.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?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 this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * 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.
- */
--->
-
-<configuration supports_final="true">
-  <property>
-    <name>security.client.protocol.acl</name>
-    <value>*</value>
-    <description>ACL for HRegionInterface protocol implementations (ie. 
-    clients talking to HRegionServers)
-    The ACL is a comma-separated list of user and group names. The user and 
-    group list is separated by a blank. For e.g. "alice,bob users,wheel". 
-    A special value of "*" means all users are allowed.</description>
-  </property>
-
-  <property>
-    <name>security.admin.protocol.acl</name>
-    <value>*</value>
-    <description>ACL for HMasterInterface protocol implementation (ie. 
-    clients talking to HMaster for admin operations).
-    The ACL is a comma-separated list of user and group names. The user and 
-    group list is separated by a blank. For e.g. "alice,bob users,wheel". 
-    A special value of "*" means all users are allowed.</description>
-  </property>
-
-  <property>
-    <name>security.masterregion.protocol.acl</name>
-    <value>*</value>
-    <description>ACL for HMasterRegionInterface protocol implementations
-    (for HRegionServers communicating with HMaster)
-    The ACL is a comma-separated list of user and group names. The user and 
-    group list is separated by a blank. For e.g. "alice,bob users,wheel". 
-    A special value of "*" means all users are allowed.</description>
-  </property>
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/hbase-site.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/hbase-site.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/hbase-site.xml
deleted file mode 100644
index 8867f08..0000000
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/hbase-site.xml
+++ /dev/null
@@ -1,759 +0,0 @@
-<?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 this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * 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.
- */
--->
-<configuration supports_final="true">
-  <property>
-    <name>hbase.rootdir</name>
-    <value>hdfs://localhost:8020/apps/hbase/data</value>
-    <description>The directory shared by region servers and into
-    which HBase persists.  The URL should be 'fully-qualified'
-    to include the filesystem scheme.  For example, to specify the
-    HDFS directory '/hbase' where the HDFS instance's namenode is
-    running at namenode.example.org on port 9000, set this value to:
-    hdfs://namenode.example.org:9000/hbase.  By default HBase writes
-    into /tmp.  Change this configuration else all data will be lost
-    on machine restart.
-    </description>
-  </property>
-  <property>
-    <name>hbase.cluster.distributed</name>
-    <value>true</value>
-    <description>The mode the cluster will be in. Possible values are
-      false for standalone mode and true for distributed mode.  If
-      false, startup will run all HBase and ZooKeeper daemons together
-      in the one JVM.
-    </description>
-  </property>
-  <property>
-    <name>hbase.master.port</name>
-    <value>16000</value>
-    <display-name>HBase Master Port</display-name>
-    <description>The port the HBase Master should bind to.</description>
-    <value-attributes>
-      <overridable>false</overridable>
-      <type>int</type>
-    </value-attributes>
-  </property>
-  <property>
-    <name>hbase.tmp.dir</name>
-    <value>/hadoop/hbase</value>
-    <description>Temporary directory on the local filesystem.
-    Change this setting to point to a location more permanent
-    than '/tmp' (The '/tmp' directory is often cleared on
-    machine restart).
-    </description>
-    <display-name>HBase tmp directory</display-name>
-    <value-attributes>
-      <type>directory</type>
-    </value-attributes>
-  </property>
-  <property>
-    <name>hbase.local.dir</name>
-    <value>${hbase.tmp.dir}/local</value>
-    <description>Directory on the local filesystem to be used as a local 
storage
-    </description>
-  </property>
-  <property>
-    <name>hbase.master.info.bindAddress</name>
-    <value>0.0.0.0</value>
-    <description>The bind address for the HBase Master web UI
-    </description>
-  </property>
-  <property>
-    <name>hbase.master.info.port</name>
-    <value>16010</value>
-    <description>The port for the HBase Master web UI.</description>
-  </property>
-  <property>
-    <name>hbase.regionserver.port</name>
-    <value>16020</value>
-    <description>The port the HBase Region Server should bind to.</description>
-  </property>
-  <property>
-    <name>hbase.regionserver.info.port</name>
-    <value>16030</value>
-    <description>The port for the HBase RegionServer web UI.</description>
-  </property>
-  <property>
-    <name>hbase.regionserver.global.memstore.upperLimit</name>
-    <value>0.4</value>
-    <description>
-      Percentage of RegionServer memory to allocate to write buffers.
-      Each column family within each region is allocated a smaller
-      pool (the memstore) within this shared write pool. If this buffer is 
full,
-      updates are blocked and data is flushed from memstores until a global low
-      watermark (hbase.regionserver.global.memstore.size.lower.limit) is 
reached.
-    </description>
-    <display-name>% of RegionServer Allocated to Write Buffers</display-name>
-    <value-attributes>
-      <type>float</type>
-      <minimum>0</minimum>
-      <maximum>0.8</maximum>
-      <increment-step>0.01</increment-step>
-    </value-attributes>
-  </property>
-  <property>
-    <name>hbase.regionserver.handler.count</name>
-    <value>60</value>
-    <description>Count of RPC Listener instances spun up on RegionServers.
-    Same property is used by the Master for count of master handlers.
-    </description>
-    <display-name>Number of Handlers per RegionServer</display-name>
-    <value-attributes>
-      <type>int</type>
-      <minimum>5</minimum>
-      <maximum>240</maximum>
-      <increment-step>1</increment-step>
-    </value-attributes>
-  </property>
-  <property>
-    <name>hbase.hregion.majorcompaction</name>
-    <value>604800000</value>
-    <description>
-      Time between major compactions. Set to 0 to disable automatic major 
compactions.
-    </description>
-    <display-name>Major Compaction Interval</display-name>
-    <value-attributes>
-      <type>int</type>
-      <minimum>0</minimum>
-      <maximum>2592000000</maximum>
-      <unit>milliseconds</unit>
-    </value-attributes>
-  </property>
-  <property>
-    <name>hbase.hregion.majorcompaction.jitter</name>
-    <value>0.50</value>
-    <description>A multiplier applied to hbase.hregion.majorcompaction to 
cause compaction to occur
-      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>
-  </property>
-  <property>
-    <name>hbase.hregion.memstore.block.multiplier</name>
-    <value>4</value>
-    <description>
-    Block updates if memstore has hbase.hregion.memstore.block.multiplier
-    times hbase.hregion.memstore.flush.size bytes.  Useful preventing
-    runaway memstore during spikes in update traffic.  Without an
-    upper-bound, memstore fills such that when it flushes the
-    resultant flush files take a long time to compact or split, or
-    worse, we OOME.
-    </description>
-    <display-name>Per-Column Family Memstore Block Multiplier</display-name>
-    <value-attributes>
-      <type>value-list</type>
-      <entries>
-        <entry>
-          <value>2</value>
-        </entry>
-        <entry>
-          <value>4</value>
-        </entry>
-        <entry>
-          <value>8</value>
-        </entry>
-      </entries>
-      <selection-cardinality>1</selection-cardinality>
-    </value-attributes>
-  </property>
-  <property>
-    <name>hbase.hregion.memstore.flush.size</name>
-    <value>134217728</value>
-    <description>
-      The size of an individual memstore. Each column familiy within each 
region is allocated its own memstore.
-    </description>
-    <display-name>Per-Column Family Memstore Flush Size</display-name>
-    <value-attributes>
-      <type>int</type>
-      <minimum>33554432</minimum>
-      <maximum>268435456</maximum>
-      <increment-step>1048576</increment-step>
-      <unit>B</unit>
-    </value-attributes>
-  </property>
-  <property>
-    <name>hbase.hregion.memstore.mslab.enabled</name>
-    <value>true</value>
-    <description>
-      Enables the MemStore-Local Allocation Buffer,
-      a feature which works to prevent heap fragmentation under
-      heavy write loads. This can reduce the frequency of stop-the-world
-      GC pauses on large heaps.
-    </description>
-    <value-attributes>
-      <type>boolean</type>
-    </value-attributes>
-  </property>
-  <property>
-    <name>hbase.hregion.max.filesize</name>
-    <value>10737418240</value>
-    <description>
-      Maximum HFile size. If the sum of the sizes of a region's HFiles has 
grown to exceed this
-      value, the region is split in two.
-    </description>
-    <display-name>Maximum Region File Size</display-name>
-    <value-attributes>
-      <type>int</type>
-      <minimum>1073741824</minimum>
-      <maximum>107374182400</maximum>
-      <unit>B</unit>
-      <increment-step>1073741824</increment-step>
-    </value-attributes>
-  </property>
-  <property>
-    <name>hbase.client.scanner.caching</name>
-    <value>100</value>
-    <description>Number of rows that will be fetched when calling next
-    on a scanner if it is not served from (local, client) memory. Higher
-    caching values will enable faster scanners but will eat up more memory
-    and some calls of next may take longer and longer times when the cache is 
empty.
-    Do not set this value such that the time between invocations is greater
-    than the scanner timeout; i.e. hbase.regionserver.lease.period
-    </description>
-    <display-name>Number of Fetched Rows when Scanning from Disk</display-name>
-    <value-attributes>
-      <type>int</type>
-      <minimum>100</minimum>
-      <maximum>10000</maximum>
-      <increment-step>100</increment-step>
-    </value-attributes>
-  </property>
-  <property>
-    <name>zookeeper.session.timeout</name>
-    <value>120000</value>
-    <description>ZooKeeper session timeout.
-      ZooKeeper session timeout in milliseconds. It is used in two different 
ways.
-      First, this value is used in the ZK client that HBase uses to connect to 
the ensemble.
-      It is also used by HBase when it starts a ZK server and it is passed as 
the 'maxSessionTimeout'. See
-      
http://hadoop.apache.org/zookeeper/docs/current/zookeeperProgrammers.html#ch_zkSessions.
-      For example, if a HBase region server connects to a ZK ensemble that's 
also managed by HBase, then the
-      session timeout will be the one specified by this configuration. But, a 
region server that connects
-      to an ensemble managed with a different configuration will be subjected 
that ensemble's maxSessionTimeout. So,
-      even though HBase might propose using 90 seconds, the ensemble can have 
a max timeout lower than this and
-      it will take precedence.
-    </description>
-    <display-name>Zookeeper Session Timeout</display-name>
-    <value-attributes>
-      <type>int</type>
-      <minimum>10000</minimum>
-      <maximum>180000</maximum>
-      <unit>milliseconds</unit>
-      <increment-step>10000</increment-step>
-    </value-attributes>
-  </property>
-  <property>
-    <name>hbase.client.keyvalue.maxsize</name>
-    <value>10485760</value>
-    <description>Specifies the combined maximum allowed size of a KeyValue
-    instance. This is to set an upper boundary for a single entry saved in a
-    storage file. Since they cannot be split it helps avoiding that a region
-    cannot be split any further because the data is too large. It seems wise
-    to set this to a fraction of the maximum region size. Setting it to zero
-    or less disables the check.
-    </description>
-    <display-name>Maximum Record Size</display-name>
-    <value-attributes>
-      <type>int</type>
-      <minimum>1048576</minimum>
-      <maximum>31457280</maximum>
-      <unit>B</unit>
-      <increment-step>262144</increment-step>
-    </value-attributes>
-  </property>
-  <property>
-    <name>hbase.hstore.compactionThreshold</name>
-    <value>3</value>
-    <description>
-      The maximum number of StoreFiles which will be selected for a single 
minor
-      compaction, regardless of the number of eligible StoreFiles. 
Effectively, the value of
-      hbase.hstore.compaction.max controls the length of time it takes a 
single compaction to
-      complete. Setting it larger means that more StoreFiles are included in a 
compaction. For most
-      cases, the default value is appropriate.
-    </description>
-    <display-name>Maximum Store Files before Minor Compaction</display-name>
-    <value-attributes>
-      <type>int</type>
-      <entries>
-        <entry>
-          <value>2</value>
-        </entry>
-        <entry>
-          <value>3</value>
-        </entry>
-        <entry>
-          <value>4</value>
-        </entry>
-      </entries>
-    </value-attributes>
-  </property>
-  <property>
-    <name>hbase.hstore.flush.retries.number</name>
-    <value>120</value>
-    <description>
-    The number of times the region flush operation will be retried.
-    </description>
-  </property>
-  
-  <property>
-    <name>hbase.hstore.blockingStoreFiles</name>
-    <display-name>hstore blocking storefiles</display-name>
-    <value>10</value>
-    <description>
-    If more than this number of StoreFiles in any one Store
-    (one StoreFile is written per flush of MemStore) then updates are
-    blocked for this HRegion until a compaction is completed, or
-    until hbase.hstore.blockingWaitTime has been exceeded.
-    </description>
-    <value-attributes>
-      <type>int</type>
-    </value-attributes>
-  </property>
-  <property>
-    <name>hfile.block.cache.size</name>
-    <value>0.40</value>
-    <description>Percentage of RegionServer memory to allocate to read 
buffers.</description>
-    <display-name>% of RegionServer Allocated to Read Buffers</display-name>
-    <value-attributes>
-      <type>float</type>
-      <minimum>0</minimum>
-      <maximum>0.8</maximum>
-      <increment-step>0.01</increment-step>
-    </value-attributes>
-  </property>
-
-  <!-- The following properties configure authentication information for
-       HBase processes when using Kerberos security.  There are no default
-       values, included here for documentation purposes -->
-  <property>
-    <name>hbase.master.keytab.file</name>
-    <value>/etc/security/keytabs/hbase.service.keytab</value>
-    <description>Full path to the kerberos keytab file to use for logging in
-    the configured HMaster server principal.
-    </description>
-  </property>
-  <property>
-    <name>hbase.master.kerberos.principal</name>
-    <value>hbase/_h...@example.com</value>
-    <description>Ex. "hbase/_h...@example.com".  The kerberos principal name
-    that should be used to run the HMaster process.  The principal name should
-    be in the form: user/hostname@DOMAIN.  If "_HOST" is used as the hostname
-    portion, it will be replaced with the actual hostname of the running
-    instance.
-    </description>
-  </property>
-  <property>
-    <name>hbase.regionserver.keytab.file</name>
-    <value>/etc/security/keytabs/hbase.service.keytab</value>
-    <description>Full path to the kerberos keytab file to use for logging in
-    the configured HRegionServer server principal.
-    </description>
-  </property>
-  <property>
-    <name>hbase.regionserver.kerberos.principal</name>
-    <value>hbase/_h...@example.com</value>
-    <description>Ex. "hbase/_h...@example.com".  The kerberos principal name
-    that should be used to run the HRegionServer process.  The principal name
-    should be in the form: user/hostname@DOMAIN.  If "_HOST" is used as the
-    hostname portion, it will be replaced with the actual hostname of the
-    running instance.  An entry for this principal must exist in the file
-    specified in hbase.regionserver.keytab.file
-    </description>
-  </property>
-
-  <property>
-    <name>hbase.rest.keytab.file</name>
-    <value>/etc/security/keytabs/hbase.service.keytab</value>
-  </property>
-  <property>
-    <name>hbase.rest.kerberos.principal</name>
-    <value>hbase/_h...@example.com</value>
-  </property>
-  <property>
-    <name>hbase.rest.authentication.kerberos.keytab</name>
-    <value>/etc/security/keytabs/hbase.service.keytab</value>
-  </property>
-  <property>
-    <name>hbase.rest.authentication.kerberos.principal</name>
-    <value>HTTP/_h...@example.com</value>
-  </property>
-
-  <!-- Additional configuration specific to HBase security -->
-  <property>
-    <name>hbase.superuser</name>
-    <value>hbase</value>
-    <description>List of users or groups (comma-separated), who are allowed
-    full privileges, regardless of stored ACLs, across the cluster.
-    Only used when HBase security is enabled.
-    </description>
-  </property>
-
-  <property>
-    <name>hbase.security.authentication</name>
-    <value>simple</value>
-    <description>
-      Select Simple or Kerberos authentication. Note: Kerberos must be set up 
before the Kerberos option will take effect.
-    </description>
-    <display-name>Enable Authentication</display-name>
-    <value-attributes>
-      <type>value-list</type>
-      <entries>
-        <entry>
-          <label>Simple</label>
-          <value>simple</value>
-        </entry>
-        <entry>
-          <label>Kerberos</label>
-          <value>kerberos</value>
-        </entry>
-      </entries>
-      <selection-cardinality>1</selection-cardinality>
-    </value-attributes>
-  </property>
-
-  <property>
-    <name>hbase.security.authorization</name>
-    <value>false</value>
-    <description> Set Authorization Method.</description>
-    <display-name>Enable Authorization</display-name>
-    <value-attributes>
-      <type>value-list</type>
-      <entries>
-        <entry>
-          <value>true</value>
-          <label>Native</label>
-        </entry>
-        <entry>
-          <value>false</value>
-          <label>Off</label>
-        </entry>
-      </entries>
-      <selection-cardinality>1</selection-cardinality>
-    </value-attributes>
-    <depends-on>
-      <property>
-        <type>ranger-hbase-plugin-properties</type>
-        <name>ranger-hbase-plugin-enabled</name>
-      </property>
-    </depends-on>
-  </property>
-  
-  <property>
-    <name>hbase.table.sanity.checks</name>
-    <value>true</value>
-  </property>
-  
-
-  <property>
-    <name>hbase.coprocessor.region.classes</name>
-    <value></value>
-    <description>A comma-separated list of Coprocessors that are loaded by
-    default on all tables. For any override coprocessor method, these classes
-    will be called in order. After implementing your own Coprocessor, just put
-    it in HBase's classpath and add the fully qualified class name here.
-    A coprocessor can also be loaded on demand by setting HTableDescriptor.
-    </description>
-    <value-attributes>
-      <empty-value-valid>true</empty-value-valid>
-    </value-attributes>
-    <depends-on>
-      <property>
-        <type>hbase-site</type>
-        <name>hbase.security.authorization</name>
-      </property>
-      <property>
-        <type>hbase-site</type>
-        <name>hbase.security.authentication</name>
-      </property>
-    </depends-on>
-  </property>
-
-  <property>
-    <name>hbase.coprocessor.regionserver.classes</name>
-    <value></value>
-    <description>A comma-separated list of RegionServerObserver coprocessors 
that
-      are to be registered and run within the context of the HBase region 
server.
-    </description>
-    <value-attributes>
-      <empty-value-valid>true</empty-value-valid>
-    </value-attributes>
-    <depends-on>
-      <property>
-        <type>hbase-site</type>
-        <name>hbase.security.authorization</name>
-      </property>
-    </depends-on>
-  </property>
-
-  <property>
-    <name>hbase.coprocessor.master.classes</name>
-    <value></value>
-    <description>A comma-separated list of
-      org.apache.hadoop.hbase.coprocessor.MasterObserver coprocessors that are
-      loaded by default on the active HMaster process. For any implemented
-      coprocessor methods, the listed classes will be called in order. After
-      implementing your own MasterObserver, just put it in HBase's classpath
-      and add the fully qualified class name here.
-    </description>
-    <value-attributes>
-      <empty-value-valid>true</empty-value-valid>
-    </value-attributes>
-    <depends-on>
-      <property>
-        <type>hbase-site</type>
-        <name>hbase.security.authorization</name>
-      </property>
-    </depends-on>
-  </property>
-
-  <property>
-    <name>hbase.zookeeper.property.clientPort</name>
-    <value>2181</value>
-    <description>Property from ZooKeeper's config zoo.cfg.
-    The port at which the clients will connect.
-    </description>
-  </property>
-
-  <!--
-  The following three properties are used together to create the list of
-  host:peer_port:leader_port quorum servers for ZooKeeper.
-  -->
-  <property>
-    <name>hbase.zookeeper.quorum</name>
-    <value>localhost</value>
-    <description>Comma separated list of servers in the ZooKeeper Quorum.
-    For example, "host1.mydomain.com,host2.mydomain.com,host3.mydomain.com".
-    By default this is set to localhost for local and pseudo-distributed modes
-    of operation. For a fully-distributed setup, this should be set to a full
-    list of ZooKeeper quorum servers. If HBASE_MANAGES_ZK is set in 
hbase-env.sh
-    this is the list of servers which we will start/stop ZooKeeper on.
-    </description>
-    <value-attributes>
-      <type>multiLine</type>
-    </value-attributes>
-  </property>
-  <!-- End of properties used to generate ZooKeeper host:port quorum list. -->
-
-  <property>
-    <name>hbase.zookeeper.useMulti</name>
-    <value>true</value>
-    <description>Instructs HBase to make use of ZooKeeper's multi-update 
functionality.
-    This allows certain ZooKeeper operations to complete more quickly and 
prevents some issues
-    with rare Replication failure scenarios (see the release note of 
HBASE-2611 for an example).·
-    IMPORTANT: only set this to true if all ZooKeeper servers in the cluster 
are on version 3.4+
-    and will not be downgraded.  ZooKeeper versions before 3.4 do not support 
multi-update and will
-    not fail gracefully if multi-update is invoked (see ZOOKEEPER-1495).
-    </description>
-  </property>
-  <property>
-    <name>zookeeper.znode.parent</name>
-    <value>/hbase-unsecure</value>
-    <description>Root ZNode for HBase in ZooKeeper. All of HBase's ZooKeeper
-      files that are configured with a relative path will go under this node.
-      By default, all of HBase's ZooKeeper file path are configured with a
-      relative path, so they will all go under this directory unless changed.
-    </description>
-  </property>
- 
-  <property>
-    <name>hbase.client.retries.number</name>
-    <value>35</value>
-    <description>Maximum retries.  Used as maximum for all retryable
-    operations such as the getting of a cell's value, starting a row update,
-    etc.  Retry interval is a rough function based on hbase.client.pause.  At
-    first we retry at this interval but then with backoff, we pretty quickly 
reach
-    retrying every ten seconds.  See HConstants#RETRY_BACKOFF for how the 
backup
-    ramps up.  Change this setting and hbase.client.pause to suit your 
workload.</description>
-    <display-name>Maximum Client Retries</display-name>
-    <value-attributes>
-      <type>int</type>
-      <minimum>5</minimum>
-      <maximum>50</maximum>
-      <increment-step>1</increment-step>
-    </value-attributes>
-  </property>
-  
-  <property>
-    <name>hbase.rpc.timeout</name>
-    <value>90000</value>
-    <description>
-      This is for the RPC layer to define how long HBase client applications
-      take for a remote call to time out. It uses pings to check connections
-      but will eventually throw a TimeoutException.
-    </description>
-    <display-name>HBase RPC Timeout</display-name>
-    <value-attributes>
-      <type>int</type>
-      <minimum>10000</minimum>
-      <maximum>180000</maximum>
-      <unit>milliseconds</unit>
-      <increment-step>10000</increment-step>
-    </value-attributes>
-  </property>
-  
-   <property>
-    <name>hbase.hstore.compaction.max</name>
-    <value>10</value>
-    <description>The maximum number of StoreFiles which will be selected for a 
single minor
-      compaction, regardless of the number of eligible StoreFiles. 
Effectively, the value of
-      hbase.hstore.compaction.max controls the length of time it takes a 
single compaction to
-      complete. Setting it larger means that more StoreFiles are included in a 
compaction. For most
-      cases, the default value is appropriate.
-    </description>
-    <display-name>Maximum Files in a Store before Compaction</display-name>
-    <value-attributes>
-      <type>int</type>
-      <entries>
-        <entry>
-          <value>8</value>
-        </entry>
-        <entry>
-          <value>9</value>
-        </entry>
-        <entry>
-          <value>10</value>
-        </entry>
-        <entry>
-          <value>11</value>
-        </entry>
-        <entry>
-          <value>12</value>
-        </entry>
-        <entry>
-          <value>13</value>
-        </entry>
-        <entry>
-          <value>14</value>
-        </entry>
-        <entry>
-          <value>15</value>
-        </entry>
-      </entries>
-    </value-attributes>
-  </property>
-  
-  <property>
-    <name>hbase.regionserver.global.memstore.size</name>
-    <value>0.4</value>
-    <description>Maximum size of all memstores in a region server before new
-      updates are blocked and flushes are forced. Defaults to 40% of heap 
(0.4).
-      Updates are blocked and flushes are forced until size of all memstores
-      in a region server hits 
hbase.regionserver.global.memstore.size.lower.limit.
-    </description>
-    <display-name>% of RegionServer Allocated to Write Buffers</display-name>
-    <value-attributes>
-      <type>float</type>
-      <minimum>0</minimum>
-      <maximum>0.8</maximum>
-      <increment-step>0.01</increment-step>
-    </value-attributes>
-  </property>
-
-  <property>
-    <name>hbase.defaults.for.version.skip</name>
-    <value>true</value>
-    <description>Disables version verification.</description>
-  </property>
-
-  <property>
-    <name>dfs.domain.socket.path</name>
-    <value>/var/lib/hadoop-hdfs/dn_socket</value>
-    <description>Path to domain socket.</description>
-  </property>
-
-  <property>
-    <name>hbase.replication</name>
-    <value>true</value>
-  </property>
-
-  <property>
-    <name>hbase.rest.authentication.type</name>
-    <value>simple</value>
-  </property>
-
-  <property>
-    <name>hbase.rest.port</name>
-    <value>8091</value>
-  </property>
-
-  <property>
-    <name>hbase.regionserver.wal.codec</name>
-    <display-name>RegionServer WAL Codec</display-name>
-    <value>org.apache.hadoop.hbase.regionserver.wal.WALCellCodec</value>
-    <depends-on>
-      <property>
-        <type>hbase-env</type>
-        <name>phoenix_sql_enabled</name>
-      </property>
-    </depends-on>
-  </property>
-  <property>
-    <name>hbase.region.server.rpc.scheduler.factory.class</name>
-    <value></value>
-    <value-attributes>
-      <empty-value-valid>true</empty-value-valid>
-    </value-attributes>
-    <depends-on>
-      <property>
-        <type>hbase-env</type>
-        <name>phoenix_sql_enabled</name>
-      </property>
-    </depends-on>
-  </property>
-  <property>
-    <name>hbase.rpc.controllerfactory.class</name>
-    <value></value>
-    <value-attributes>
-      <empty-value-valid>true</empty-value-valid>
-    </value-attributes>
-    <depends-on>
-      <property>
-        <type>hbase-env</type>
-        <name>phoenix_sql_enabled</name>
-      </property>
-    </depends-on>
-  </property>
-  <property>
-    <name>phoenix.functions.allowUserDefinedFunctions</name>
-    <value> </value>
-    <depends-on>
-      <property>
-        <type>hbase-env</type>
-        <name>phoenix_sql_enabled</name>
-      </property>
-    </depends-on>
-  </property>
-  <property>
-    <name>phoenix.query.timeoutMs</name>
-    <value>60000</value>
-    <description>Number of milliseconds after which a Phoenix query will 
timeout on the client.</description>
-    <display-name>Phoenix Query Timeout</display-name>
-    <value-attributes>
-      <type>int</type>
-      <minimum>30000</minimum>
-      <maximum>180000</maximum>
-      <unit>milliseconds</unit>
-      <increment-step>10000</increment-step>
-    </value-attributes>
-  </property>
-       
-       
-  
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/ranger-hbase-audit.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/ranger-hbase-audit.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/ranger-hbase-audit.xml
deleted file mode 100644
index a950440..0000000
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/ranger-hbase-audit.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * 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.
- */
--->
-<configuration>
-
-  <property>
-    <name>xasecure.audit.is.enabled</name>
-    <value>true</value>
-    <description>Is Audit enabled?</description>
-  </property>
-
-  <property>
-    <name>xasecure.audit.destination.db</name>
-    <value>false</value>
-    <display-name>Audit to DB</display-name>
-    <description>Is Audit to DB enabled?</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>xasecure.audit.destination.db.jdbc.url</name>
-    <value>{{audit_jdbc_url}}</value>
-    <description>Audit DB JDBC URL</description>
-  </property>
-
-  <property>
-    <name>xasecure.audit.destination.db.user</name>
-    <value>{{xa_audit_db_user}}</value>
-    <description>Audit DB JDBC User</description>
-  </property>
-
-  <property>
-    <name>xasecure.audit.destination.db.password</name>
-    <value>crypted</value>
-    <property-type>PASSWORD</property-type>
-    <description>Audit DB JDBC Password</description>
-  </property>
-
-  <property>
-    <name>xasecure.audit.destination.db.jdbc.driver</name>
-    <value>{{jdbc_driver}}</value>
-    <description>Audit DB JDBC Driver</description>
-  </property>
-
-  <property>
-    <name>xasecure.audit.credential.provider.file</name>
-    <value>jceks://file{{credential_file}}</value>
-    <description>Credential file store</description>
-  </property>
-
-  <property>
-    <name>xasecure.audit.destination.db.batch.filespool.dir</name>
-    <value>/var/log/hbase/audit/db/spool</value>
-    <description>/var/log/hbase/audit/db/spool</description>
-  </property>
-
-  <property>
-    <name>xasecure.audit.destination.hdfs</name>
-    <value>true</value>
-    <display-name>Audit to HDFS</display-name>
-    <description>Is Audit to HDFS enabled?</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>xasecure.audit.destination.hdfs.dir</name>
-    <value>hdfs://NAMENODE_HOSTNAME:8020/ranger/audit</value>
-    <description>HDFS folder to write audit to, make sure the service user has 
requried permissions</description>
-    <depends-on>
-      <property>
-        <type>ranger-env</type>
-        <name>xasecure.audit.destination.hdfs.dir</name>
-      </property>
-    </depends-on>
-  </property>
-
-  <property>
-    <name>xasecure.audit.destination.hdfs.batch.filespool.dir</name>
-    <value>/var/log/hbase/audit/hdfs/spool</value>
-    <description>/var/log/hbase/audit/hdfs/spool</description>
-  </property>
-
-  <!-- Removing auditing to Solr   
-  <property>
-    <name>xasecure.audit.destination.solr</name>
-    <value>false</value>
-    <display-name>Audit to SOLR</display-name>
-    <description>Is Solr audit enabled?</description>
-    <value-attributes>
-      <type>boolean</type>
-    </value-attributes>
-    <depends-on>
-      <property>
-        <type>ranger-env</type>
-        <name>xasecure.audit.destination.solr</name>
-      </property>
-    </depends-on>
-  </property>
-
-  <property>
-    <name>xasecure.audit.destination.solr.urls</name>
-    <value></value>
-    <description>Solr URL</description>
-    <value-attributes>
-      <empty-value-valid>true</empty-value-valid>
-    </value-attributes>
-    <depends-on>
-      <property>
-        <type>ranger-admin-site</type>
-        <name>ranger.audit.solr.urls</name>
-      </property>
-    </depends-on>
-  </property>
-
-  <property>
-    <name>xasecure.audit.destination.solr.zookeepers</name>
-    <value>NONE</value>
-    <description>Solr Zookeeper string</description>
-    <depends-on>
-      <property>
-        <type>ranger-admin-site</type>
-        <name>ranger.audit.solr.zookeepers</name>
-      </property>
-    </depends-on>
-  </property>
-
-  <property>
-    <name>xasecure.audit.destination.solr.batch.filespool.dir</name>
-    <value>/var/log/hbase/audit/solr/spool</value>
-    <description>/var/log/hbase/audit/solr/spool</description>
-  </property>
-  -->
-    
-  <property>
-    <name>xasecure.audit.provider.summary.enabled</name>
-    <value>true</value>
-    <display-name>Audit provider summary enabled</display-name>
-    <description>Enable Summary audit?</description>
-    <value-attributes>
-      <type>boolean</type>
-    </value-attributes>
-  </property>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/ranger-hbase-plugin-properties.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/ranger-hbase-plugin-properties.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/ranger-hbase-plugin-properties.xml
deleted file mode 100644
index 728e6ec..0000000
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/ranger-hbase-plugin-properties.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * 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.
- */
--->
-<configuration supports_final="true">
-
-  <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>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>
-  </property>
-  
-  <property>
-    <name>ranger-hbase-plugin-enabled</name>
-    <value>No</value>
-    <display-name>Enable Ranger for HBASE</display-name>
-    <description>Enable ranger hbase plugin ?</description>
-    <value-attributes>
-      <type>boolean</type>
-      <overridable>false</overridable>
-    </value-attributes>
-    <depends-on>
-      <property>
-        <type>ranger-env</type>
-        <name>ranger-hbase-plugin-enabled</name>
-      </property>
-    </depends-on>
-  </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>
-  </property> 
-
-  <property>
-    <name>REPOSITORY_CONFIG_PASSWORD</name>
-    <value>hbase</value>
-    <display-name>Ranger repository config password</display-name>
-    <property-type>PASSWORD</property-type>
-    <description>Used for repository creation on ranger admin</description>
-  </property> 
-
-<!--
-  <property>
-    <name>XAAUDIT.DB.IS_ENABLED</name>
-    <deleted>true</deleted>
-  </property> 
-
-  <property>
-    <name>XAAUDIT.HDFS.IS_ENABLED</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>XAAUDIT.HDFS.DESTINATION_DIRECTORY</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>XAAUDIT.HDFS.LOCAL_BUFFER_DIRECTORY</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>XAAUDIT.HDFS.LOCAL_ARCHIVE_DIRECTORY</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>XAAUDIT.HDFS.DESTINTATION_FILE</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>XAAUDIT.HDFS.DESTINTATION_FLUSH_INTERVAL_SECONDS</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>XAAUDIT.HDFS.DESTINTATION_ROLLOVER_INTERVAL_SECONDS</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>XAAUDIT.HDFS.DESTINTATION_OPEN_RETRY_INTERVAL_SECONDS</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>XAAUDIT.HDFS.LOCAL_BUFFER_FILE</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>XAAUDIT.HDFS.LOCAL_BUFFER_FLUSH_INTERVAL_SECONDS</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>XAAUDIT.HDFS.LOCAL_BUFFER_ROLLOVER_INTERVAL_SECONDS</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>XAAUDIT.HDFS.LOCAL_ARCHIVE_MAX_FILE_COUNT</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>SSL_KEYSTORE_FILE_PATH</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>SSL_KEYSTORE_PASSWORD</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>SSL_TRUSTSTORE_FILE_PATH</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>SSL_TRUSTSTORE_PASSWORD</name>
-    <deleted>true</deleted>
-  </property>
-
-  <property>
-    <name>UPDATE_XAPOLICIES_ON_GRANT_REVOKE</name>
-    <deleted>true</deleted>
-  </property>
-  
-  <property>
-    <name>POLICY_MGR_URL</name>
-    <deleted>true</deleted>   
-  </property> 
-  
-  <property>
-    <name>SQL_CONNECTOR_JAR</name>
-    <deleted>true</deleted>
-  </property> 
-  
-  <property>
-    <name>XAAUDIT.DB.FLAVOUR</name>
-    <deleted>true</deleted>   
-  </property> 
-  
-  <property>
-    <name>XAAUDIT.DB.DATABASE_NAME</name>
-    <deleted>true</deleted>    
-  </property> 
-  
-  <property>
-    <name>XAAUDIT.DB.USER_NAME</name>
-    <deleted>true</deleted>    
-  </property> 
-  
-  <property>
-    <name>XAAUDIT.DB.PASSWORD</name>
-    <deleted>true</deleted>   
-  </property>
-  
-  <property>
-    <name>XAAUDIT.DB.HOSTNAME</name>
-    <deleted>true</deleted>    
-  </property>
-  
-  <property>
-    <name>REPOSITORY_NAME</name>
-    <deleted>true</deleted>   
-  </property>
--->
-  
-</configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/ranger-hbase-policymgr-ssl.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/ranger-hbase-policymgr-ssl.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/ranger-hbase-policymgr-ssl.xml
deleted file mode 100644
index 60d5887..0000000
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/ranger-hbase-policymgr-ssl.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * 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.
- */
--->
-<configuration>
-       
-       <property>
-               <name>xasecure.policymgr.clientssl.keystore</name>
-               
<value>/usr/iop/current/hbase-client/conf/ranger-plugin-keystore.jks</value>
-               <description>Java Keystore files</description>
-       </property>
-
-       <property>
-               <name>xasecure.policymgr.clientssl.keystore.password</name>
-               <value>myKeyFilePassword</value>
-               <property-type>PASSWORD</property-type>
-               <description>password for keystore</description>
-       </property>
-
-       <property>
-               <name>xasecure.policymgr.clientssl.truststore</name>
-               
<value>/usr/iop/current/hbase-client/conf/ranger-plugin-truststore.jks</value>
-               <description>java truststore file</description>
-       </property>
-
-       <property>
-               <name>xasecure.policymgr.clientssl.truststore.password</name>
-               <value>changeit</value>
-               <property-type>PASSWORD</property-type>
-               <description>java  truststore password</description>
-       </property>
-
-    <property>
-               
<name>xasecure.policymgr.clientssl.keystore.credential.file</name>
-               <value>jceks://file{{credential_file}}</value>
-               <description>java  keystore credential file</description>
-       </property>
-
-       <property>
-               
<name>xasecure.policymgr.clientssl.truststore.credential.file</name>
-               <value>jceks://file{{credential_file}}</value>
-               <description>java  truststore credential file</description>
-       </property>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/ranger-hbase-security.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/ranger-hbase-security.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/ranger-hbase-security.xml
deleted file mode 100644
index de739b7..0000000
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/configuration/ranger-hbase-security.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * 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.
- */
--->
-<configuration>
-  <property>
-    <name>ranger.plugin.hbase.service.name</name>
-    <value>{{repo_name}}</value>
-    <description>Name of the Ranger service containing HBase 
policies</description>
-  </property>
-
-  <property>
-    <name>ranger.plugin.hbase.policy.source.impl</name>
-    <value>org.apache.ranger.admin.client.RangerAdminRESTClient</value>
-    <description>Class to retrieve policies from the source</description>
-  </property>
-
-  <property>
-    <name>ranger.plugin.hbase.policy.rest.url</name>
-    <value>{{policymgr_mgr_url}}</value>
-    <description>URL to Ranger Admin</description>
-  </property>
-
-  <property>
-    <name>ranger.plugin.hbase.policy.rest.ssl.config.file</name>
-    <value>/etc/hbase/conf/ranger-policymgr-ssl.xml</value>
-    <description>Path to the file containing SSL details to contact Ranger 
Admin</description>
-  </property>
-
-  <property>
-    <name>ranger.plugin.hbase.policy.pollIntervalMs</name>
-    <value>30000</value>
-    <description>How often to poll for changes in policies?</description>
-  </property>
-
-  <property>
-    <name>ranger.plugin.hbase.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>
-  </property>
-
-  <property>
-    <name>xasecure.hbase.update.xapolicies.on.grant.revoke</name>
-    <value>true</value>
-    <display-name>Should HBase GRANT/REVOKE update XA policies</display-name>
-    <description>Should HBase plugin update Ranger policies for updates to 
permissions done using GRANT/REVOKE?</description>
-    <value-attributes>
-      <type>boolean</type>
-    </value-attributes>
-  </property>
-
-</configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/44e21f8e/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/kerberos.json
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/kerberos.json
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/kerberos.json
deleted file mode 100644
index 9fd7643..0000000
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HBASE/kerberos.json
+++ /dev/null
@@ -1,182 +0,0 @@
-{
-  "services": [
-    {
-      "name": "HBASE",
-      "identities": [
-        {
-          "name": "/spnego"
-        },
-        {
-          "name": "/hdfs"
-        },
-        {
-          "name": "hbase",
-          "principal": {
-            "value": "${hbase-env/hbase_user}-${cluster_name}@${realm}",
-            "type" : "user",
-            "configuration": "hbase-env/hbase_principal_name",
-            "local_username": "${hbase-env/hbase_user}"
-          },
-          "keytab": {
-            "file": "${keytab_dir}/hbase.headless.keytab",
-            "owner": {
-              "name": "${hbase-env/hbase_user}",
-              "access": "r"
-            },
-            "group": {
-              "name": "${cluster-env/user_group}",
-              "access": "r"
-            },
-            "configuration": "hbase-env/hbase_user_keytab"
-          }
-        },
-        {
-          "name": "/smokeuser"
-        }
-      ],
-      "configurations": [
-        {
-          "hbase-site": {
-            "hbase.security.authentication": "kerberos",
-            "hbase.security.authorization": "true",
-            "hbase.rest.authentication.type": "kerberos",
-            "zookeeper.znode.parent": "/hbase-secure",
-            "hbase.coprocessor.master.classes": 
"org.apache.hadoop.hbase.security.access.AccessController",
-            "hbase.coprocessor.region.classes": 
"org.apache.hadoop.hbase.security.token.TokenProvider,org.apache.hadoop.hbase.security.access.SecureBulkLoadEndpoint,org.apache.hadoop.hbase.security.access.AccessController",
-            "hbase.bulkload.staging.dir": "/apps/hbase/staging"
-          }
-        }
-      ],
-      "components": [
-        {
-          "name": "HBASE_MASTER",
-          "identities": [
-            {
-              "name": "/HDFS/NAMENODE/hdfs"
-            },
-            {
-              "name": "hbase_master_hbase",
-              "principal": {
-                "value": "hbase/_HOST@${realm}",
-                "type" : "service",
-                "configuration": "hbase-site/hbase.master.kerberos.principal",
-                "local_username": "${hbase-env/hbase_user}"
-              },
-              "keytab": {
-                "file": "${keytab_dir}/hbase.service.keytab",
-                "owner": {
-                  "name": "${hbase-env/hbase_user}",
-                  "access": "r"
-                },
-                "group": {
-                  "name": "${cluster-env/user_group}",
-                  "access": ""
-                },
-                "configuration": "hbase-site/hbase.master.keytab.file"
-              }
-            }
-          ]
-        },
-        {
-          "name": "HBASE_REGIONSERVER",
-          "identities": [
-            {
-              "name": "hbase_regionserver_hbase",
-              "principal": {
-                "value": "hbase/_HOST@${realm}",
-                "type" : "service",
-                "configuration": 
"hbase-site/hbase.regionserver.kerberos.principal",
-                "local_username": "${hbase-env/hbase_user}"
-              },
-              "keytab": {
-                "file": "${keytab_dir}/hbase.service.keytab",
-                "owner": {
-                  "name": "${hbase-env/hbase_user}",
-                  "access": "r"
-                },
-                "group": {
-                  "name": "${cluster-env/user_group}",
-                  "access": ""
-                },
-                "configuration": "hbase-site/hbase.regionserver.keytab.file"
-              }
-            }
-          ]
-        },
-        {
-          "name": "HBASE_REST_SERVER",
-          "identities": [
-            {
-              "name": "hbase_rest_server_hbase",
-              "principal": {
-                "value": "hbase/_HOST@${realm}",
-                "type" : "service",
-                "configuration": "hbase-site/hbase.rest.kerberos.principal",
-                "local_username": "${hbase-env/hbase_user}"
-              },
-              "keytab": {
-                "file": "${keytab_dir}/hbase.service.keytab",
-                "owner": {
-                  "name": "${hbase-env/hbase_user}",
-                  "access": "r"
-                },
-                "group": {
-                  "name": "${cluster-env/user_group}",
-                  "access": ""
-                },
-                "configuration": "hbase-site/hbase.rest.keytab.file"
-              }
-            },
-            {
-              "name": "hbase_rest_server_spnego",
-              "principal": {
-                "value": "HTTP/_HOST@${realm}",
-                "type" : "service",
-                "configuration": 
"hbase-site/hbase.rest.authentication.kerberos.principal",
-                "local_username": "${hbase-env/hbase_user}"
-              },
-              "keytab": {
-                "file": "${keytab_dir}/hbase.service.keytab",
-                "owner": {
-                  "name": "${hbase-env/hbase_user}",
-                  "access": "r"
-                },
-                "group": {
-                  "name": "${cluster-env/user_group}",
-                  "access": ""
-                },
-                "configuration": 
"hbase-site/hbase.rest.authentication.kerberos.keytab"
-              }
-            }
-          ]
-        },
-        {
-          "name": "PHOENIX_QUERY_SERVER",
-          "identities": [
-            {
-              "name": "hbase_queryserver_hbase",
-              "principal": {
-                "value": "hbase/_HOST@${realm}",
-                "type" : "service",
-                "configuration": 
"hbase-site/phoenix.queryserver.kerberos.principal",
-                "local_username": "${hbase-env/hbase_user}"
-              },
-              "keytab": {
-                "file": "${keytab_dir}/hbase.service.keytab",
-                "owner": {
-                  "name": "${hbase-env/hbase_user}",
-                  "access": "r"
-                },
-                "group": {
-                  "name": "${cluster-env/user_group}",
-                  "access": ""
-                },
-                "configuration": "hbase-site/phoenix.queryserver.keytab.file"
-              }
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

Reply via email to