Hadoop HDFS-only deployment updates and fixes, removed Hive and Spark

deployments/hadoop-hdfs/plugin.py

-import hadoop.plugin
+import deployments.hadoop.plugin
 
 
-class Component(hadoop.plugin.ComponentHadoop):
+class Component(deployments.hadoop.plugin.ComponentHadoop):
     pass

deployments/hadoop-hdfs/site.pp.tmpl

@@ -20,23 +20,11 @@ if $$distribution == 'bigtop' {
   $$version = '6.3.0'
   $$hadoop_version = 3
 }
-$$hive_schema_file = "$${distribution}-$${version}" ? {
-  'bigtop-1.4.0'   => 'hive-schema-2.3.0.mysql.sql',
-  'bigtop-1.5.0'   => 'hive-schema-2.3.0.mysql.sql',
-  'cloudera-6.3.0' => 'hive-schema-2.1.1.mysql.sql',
-  'cloudera-6.3.2' => 'hive-schema-2.1.1.mysql.sql',
-  default          => undef, # stringify_facts=false required
-}
-$$db_type = "$${operatingsystem}-$${operatingsystemmajrelease}" ? {
-  'Debian-9' => 'mysql',
-  default    => 'mariadb',
-}
 
 $$principals = suffix(concat(
   prefix(concat([$$master], $$nodes), 'host/'),
   prefix(concat([$$master], $$nodes), 'HTTP/'),
   ["httpfs/$$master"],
-  ["hive/$$master"],
   prefix($$nodes, 'dn/'),
   ["nfs/$$master"],
   ["nn/$$master"],
@@ -93,30 +81,6 @@ class{'hadoop':
   hdfs_deployed          => $$hdfs_deployed,
 }
 
-class{'hive':
-  hdfs_hostname       => $$master,
-  metastore_hostname  => $$master,
-  server2_hostname    => $$master,
-  zookeeper_hostnames => $$zookeepers,
-  realm               => $$realm,
-  features            => {
-    'manager' => true,
-  },
-  db                  => $$db_type,
-  db_password         => 'good-password',
-  schema_file         => $$hive_schema_file,
-}
-
-class { 'spark':
-  historyserver_hostname => $$master,
-  environment => {
-    'LD_LIBRARY_PATH'     => '/usr/lib/hadoop/lib/native:$${LD_LIBRARY_PATH}',
-    'SPARK_YARN_USER_ENV' => 'LD_LIBRARY_PATH=$${LD_LIBRARY_PATH},$${SPARK_YARN_USER_ENV}',
-  },
-  #jar_enable            => true,
-  realm                 => $$realm,
-}
-
 class { '::zookeeper':
   hostnames => $$zookeepers,
   realm     => $$realm,
@@ -127,10 +91,11 @@ class{'site_hadoop':
   version             => $$version,
   accounting_enable   => false,
   hbase_enable        => false,
+  hive_enable         => false,
   nfs_frontend_enable => false,
   oozie_enable        => false,
   pig_enable          => false,
-  spark_enable        => true,
+  spark_enable        => false,
 }
 
 group{$image_user:
@@ -179,9 +144,6 @@ class local_kerberos_master {
   kerberos::keytab{'/etc/krb5.keytab':
     principals => ["host/$${::fqdn}@$${realm}"],
   }
-  kerberos::keytab{'/etc/security/keytab/hive.service.keytab':
-    principals => ["hive/$${::fqdn}@$${realm}"],
-  }
   kerberos::keytab{'/etc/security/keytab/http.service.keytab':
     principals => ["HTTP/$${::fqdn}@$${realm}"],
   }
@@ -228,13 +190,6 @@ node /${master_hostname}\..*/ {
   include ::site_hadoop::role::master_hdfs
   include ::site_hadoop::role::frontend
   include ::hadoop::httpfs
-  class { 'mysql::bindings':
-    java_enable => true,
-    java_package_name => "lib$${db_type}-java",
-  }
-  class { 'mysql::server':
-    root_password  => 'root',
-  }
 
   class{'local_kerberos_master':
     stage => 'kerberos',

deployments/hadoop/adduser.sh.tmpl

@@ -44,6 +44,7 @@ if [ "$$MASTER" = "$$FQDN" ]; then
 		su hdfs -p -c kdestroy
 	fi
 
+	if [ -f "$$KEYTAB_HBASE" ]; then
 		if [ -n "$$REALM" ]; then
 			export KRB5CCNAME=FILE:/tmp/krb5cc_admin_hbase_$$$$
 			su hbase -p -c "kinit -k -t '$${KEYTAB_HBASE}' '$${PRINCIPAL_HBASE}'"
@@ -57,6 +58,7 @@ if [ "$$MASTER" = "$$FQDN" ]; then
 		else
 			echo "create_namespace '$${NAME}'" | su hbase -s /bin/bash -p -c 'hbase shell -n' >/dev/null
 		fi
+	fi
 
 else
 	if ! getent passwd $${NAME} >/dev/null; then