Revert "AMBARI-9468. Support secure HDFS with AMS in distributed mode…

… service (rlevas)"

Reverting since this is a suspect for causing NPE failure when trying to Add Service.
This reverts commit e36b231.

ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector

@@ -228,7 +228,7 @@ case "$1" in
         rm -f "${PIDFILE}" >/dev/null 2>&1
     fi
 
-    nohup "${JAVA}" "-cp" "/usr/lib/ambari-metrics-collector/*:${COLLECTOR_CONF_DIR}" ${AMS_COLLECTOR_OPTS} "-Djava.net.preferIPv4Stack=true" "-Dams.log.dir=${AMS_COLLECTOR_LOG_DIR}" "-Dproc_${DAEMON_NAME}" "${CLASS}" "$@" > $OUTFILE 2>&1 &
+    nohup "${JAVA}" "-cp" "/usr/lib/ambari-metrics-collector/*:${COLLECTOR_CONF_DIR}" "-Djava.net.preferIPv4Stack=true" "-Dams.log.dir=${AMS_COLLECTOR_LOG_DIR}" "-Dproc_${DAEMON_NAME}" "${CLASS}" "$@" > $OUTFILE 2>&1 &
     PID=$!
     write_pidfile "${PIDFILE}"
     sleep 2

ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-env.xml

@@ -68,12 +68,6 @@ export AMS_MONITOR_PID_DIR={{ams_monitor_pid_dir}}
 
 # AMS HBase pid directory
 export AMS_HBASE_PID_DIR={{hbase_pid_dir}}
-
-export AMS_COLLECTOR_OPTS=
-{% if security_enabled %}
-export AMS_COLLECTOR_OPTS="-Djava.security.auth.login.config={{ams_collector_jaas_config_file}}"
-{% endif %}
-
     </value>
   </property>
 

ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-hbase-env.xml

@@ -120,17 +120,18 @@ export HBASE_MANAGES_ZK=false
 export HBASE_OPTS="$HBASE_OPTS -Djava.security.auth.login.config={{client_jaas_config_file}}"
 export HBASE_MASTER_OPTS="$HBASE_MASTER_OPTS -Djava.security.auth.login.config={{master_jaas_config_file}}"
 export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS -Djava.security.auth.login.config={{regionserver_jaas_config_file}}"
-export HBASE_ZOOKEEPER_OPTS="$HBASE_ZOOKEEPER_OPTS -Djava.security.auth.login.config={{ams_zookeeper_jaas_config_file}}"
 {% endif %}
 
-# use embedded native libs
+#Specify native libraries of installed Hadoop paltform
+#_HADOOP_IN_PATH=$(PATH="${HADOOP_HOME:-${HADOOP_PREFIX}}/bin:$PATH" which hadoop 2>/dev/null)
+#_HADOOP_CLASSPATH="/usr/lib/ams-hbase/lib/*"
+#_HADOOP_JAVA_LIBRARY_PATH=$(HADOOP_CLASSPATH="$_HADOOP_CLASSPATH" ${_HADOOP_IN_PATH} org.apache.hadoop.hbase.util.GetJavaProperty java.library.path)
+#use embedded native libs
 _HADOOP_NATIVE_LIB="/usr/lib/ams-hbase/lib/hadoop-native/"
 export HBASE_OPTS="$HBASE_OPTS -Djava.library.path=${_HADOOP_NATIVE_LIB}"
 
-{% if disable_hadoop_environment %}
-# Unset HADOOP_HOME to avoid importing HADOOP installed cluster related configs like: /usr/hdp/2.2.0.0-2041/hadoop/conf/
-export HADOOP_HOME=`pwd`	138	export HADOOP_HOME=`pwd`
-{% endif %}
+#"Unsetting" HADOOP_HOME to avoid importing HADOOP installed cluster related configs like: /usr/hdp/2.2.0.0-2041/hadoop/conf/ 
+export HADOOP_HOME=`pwd`
     </value>
   </property>
 

ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-hbase-site.xml

@@ -48,7 +48,7 @@
   </property>
   <property>
     <name>hbase.cluster.distributed</name>
-    <value>{{hbase_cluster_distributed}}</value>
+    <value>false</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
@@ -64,7 +64,7 @@
   </property>
   <property>
     <name>hbase.zookeeper.quorum</name>
-    <value>{{zookeeper_quorum_hosts}}</value>
+    <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

ambari-server/src/main/resources/common-services/AMS/0.1.0/metainfo.xml

@@ -125,7 +125,6 @@
         <config-type>ams-log4j</config-type>
         <config-type>ams-hbase-policy</config-type>
         <config-type>ams-hbase-site</config-type>
-        <config-type>ams-hbase-security-site</config-type>
         <config-type>ams-hbase-env</config-type>
         <config-type>ams-hbase-log4j</config-type>
       </configuration-dependencies>

ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/ams.py

@@ -18,7 +18,6 @@
 
 """
 
-import os
 from resource_management import *
 from ambari_commons import OSConst
 from service_mapping import *
@@ -50,14 +49,9 @@ def ams(name=None):
               owner=params.ams_user,
     )
 
-    merged_ams_hbase_site = {}
-    merged_ams_hbase_site.update(params.config['configurations']['ams-hbase-site'])
-    if params.security_enabled:
-      merged_ams_hbase_site.update(params.config['configurations']['ams-hbase-security-site'])
-
     XmlConfig( "hbase-site.xml",
                conf_dir = params.ams_collector_conf_dir,
-               configurations = merged_ams_hbase_site,
+               configurations = params.config['configurations']['ams-hbase-site'],
                configuration_attributes=params.config['configuration_attributes']['ams-hbase-site'],
                owner = params.ams_user,
     )
@@ -136,24 +130,14 @@ def ams(name=None):
               group=params.user_group
     )
 
-    merged_ams_hbase_site = {}
-    merged_ams_hbase_site.update(params.config['configurations']['ams-hbase-site'])
-    if params.security_enabled:
-      merged_ams_hbase_site.update(params.config['configurations']['ams-hbase-security-site'])
-
     XmlConfig( "hbase-site.xml",
                conf_dir = params.ams_collector_conf_dir,
-               configurations = merged_ams_hbase_site,
+               configurations = params.config['configurations']['ams-hbase-site'],
                configuration_attributes=params.config['configuration_attributes']['ams-hbase-site'],
                owner = params.ams_user,
                group = params.user_group
     )
 
-    if params.security_enabled:
-      TemplateConfig(os.path.join(params.hbase_conf_dir, "ams_collector_jaas.conf"),
-                     owner = params.ams_user,
-                     template_tag = None)
-
     if (params.log4j_props != None):
       File(format("{params.ams_collector_conf_dir}/log4j.properties"),
            mode=0644,

ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/hbase.py

@@ -114,14 +114,9 @@ def hbase(name=None # 'master' or 'regionserver' or 'client'
              recursive = True
   )
 
-  merged_ams_hbase_site = {}
-  merged_ams_hbase_site.update(params.config['configurations']['ams-hbase-site'])
-  if params.security_enabled:
-    merged_ams_hbase_site.update(params.config['configurations']['ams-hbase-security-site'])
-
   XmlConfig("hbase-site.xml",
             conf_dir = params.hbase_conf_dir,
-            configurations = merged_ams_hbase_site,
+            configurations = params.config['configurations']['ams-hbase-site'],
             configuration_attributes=params.config['configuration_attributes']['ams-hbase-site'],
             owner = params.hbase_user,
             group = params.user_group
@@ -162,9 +157,7 @@ def hbase(name=None # 'master' or 'regionserver' or 'client'
 
   if params.security_enabled:
     hbase_TemplateConfig( format("hbase_{name}_jaas.conf"), user=params.hbase_user)
-    hbase_TemplateConfig( format("hbase_client_jaas.conf"), user=params.hbase_user)
-    hbase_TemplateConfig( format("ams_zookeeper_jaas.conf"), user=params.hbase_user)
-
+
   if name in ["master","regionserver"]:
 
     if params.is_hbase_distributed:
@@ -174,13 +167,6 @@ def hbase(name=None # 'master' or 'regionserver' or 'client'
                            owner=params.hbase_user,
                            mode=0775
       )
-
-      params.HdfsDirectory(params.hbase_staging_dir,
-                           action="create_delayed",
-                           owner=params.hbase_user,
-                           mode=0711
-      )
-
       params.HdfsDirectory(None, action="create")
 
     else: