ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [10/15] AMBARI-5747 Remove facter-1.6.10, Ruby, Puppet dependencies from pom.xml and src (dsen)
Date Wed, 14 May 2014 14:02:18 GMT
http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/service.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/service.pp b/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/service.pp
deleted file mode 100644
index ed7731c..0000000
--- a/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/service.pp
+++ /dev/null
@@ -1,129 +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.
-#
-#
-class hdp-hive::service(
-  $ensure,
-  $service_type
-)
-{
-  include $hdp-hive::params
-  
-  $hive_user = $hdp-hive::params::hive_user
-  $hadoop_home = $hdp::params::hadoop_home
-  $hive_pid_dir = $hdp-hive::params::hive_pid_dir
-  $hive_pid = $hdp-hive::params::hive_pid
-  $hive_log_dir = $hdp-hive::params::hive_log_dir
-  $start_hiveserver2_script = $hdp-hive::params::start_hiveserver2_script
-  $start_metastore_script = $hdp-hive::params::start_metastore_script
-  $hive_var_lib = $hdp-hive::params::hive_var_lib
-  $hive_server_conf_dir = $hdp-hive::params::hive_server_conf_dir
-
-  $start_hiveserver2_path = "/tmp/$start_hiveserver2_script"
-  $start_metastore_path = "/tmp/$start_metastore_script"
-
-  if ($service_type == 'metastore') {
-    $pid_file = "$hive_pid_dir/hive.pid" 
-    $cmd = "env HADOOP_HOME=${hadoop_home} JAVA_HOME=$hdp::params::java64_home $start_metastore_path ${hive_log_dir}/hive.out ${hive_log_dir}/hive.log $pid_file $hdp-hive::params::hive_server_conf_dir"
-    
-  } elsif ($service_type == 'hiveserver2') {
-    $pid_file = "$hive_pid_dir/$hive_pid" 
-    $cmd = "env JAVA_HOME=$hdp::params::java64_home $start_hiveserver2_path ${hive_log_dir}/hive-server2.out  ${hive_log_dir}/hive-server2.log $pid_file ${hive_server_conf_dir}"
-  } else {
-    hdp_fail("TODO not implemented yet: service_state = ${service_type}")
-  }
-
-
-  $no_op_test = "ls ${pid_file} >/dev/null 2>&1 && ps `cat ${pid_file}` >/dev/null 2>&1"
-
-  if ($ensure == 'running') {
-    $daemon_cmd = "su - ${hive_user} -c  '${cmd} '"
-  } elsif ($ensure == 'stopped') {
-    $daemon_cmd = "kill `cat $pid_file` >/dev/null 2>&1 && rm -f ${pid_file}"
-  } else {
-    $daemon_cmd = undef
-  }
-
-  hdp-hive::service::directory { $hive_pid_dir : }
-  hdp-hive::service::directory { $hive_log_dir : }
-  hdp-hive::service::directory { $hive_var_lib : }
-
-  file { $start_hiveserver2_path:
-    ensure => present,
-    source => "puppet:///modules/hdp-hive/$start_hiveserver2_script",
-    mode => '0755',
-  }
-
-  file { $start_metastore_path:
-    ensure => present,
-    source => "puppet:///modules/hdp-hive/$start_metastore_script",
-    mode => '0755',
-  }
-
-  anchor{'hdp-hive::service::begin':} -> Hdp-hive::Service::Directory<||> -> anchor{'hdp-hive::service::end':}
-  
-  if ($daemon_cmd != undef) {
-    if ($ensure == 'running') {
-
-      $pid_file_state = 'present'
-      hdp::exec { $daemon_cmd:
-        command => $daemon_cmd,
-        unless  => $no_op_test
-      }
-    } elsif ($ensure == 'stopped') {
-      $pid_file_state = 'absent'
-      hdp::exec { $daemon_cmd:
-        command => $daemon_cmd,
-        onlyif  => $no_op_test
-      }
-    }
-
-    file { $pid_file:
-      ensure => $pid_file_state
-    }
-
-    if ($ensure == 'running' and ($hive_jdbc_driver == "com.mysql.jdbc.Driver" or $hive_jdbc_driver == "oracle.jdbc.driver.OracleDriver")) {
-      $db_connection_check_command = "${hdp::params::java64_home}/bin/java -cp ${hdp::params::check_db_connection_jar}:/usr/share/java/${hdp-hive::params::jdbc_jar_name} org.apache.ambari.server.DBConnectionVerification ${hdp-hive::params::hive_jdbc_connection_url} ${hdp-hive::params::hive_metastore_user_name} ${hdp-hive::params::hive_metastore_user_passwd} ${hdp-hive::params::hive_jdbc_driver}"
-    } else {
-      $db_connection_check_command = undef
-    }
-
-    if ($db_connection_check_command != undef) {
-      hdp::exec { "DB connection check $db_connection_check_command" :
-        command => $db_connection_check_command,
-        path    => '/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'
-      }
-
-      Hdp-hive::Service::Directory<||> -> Hdp::Exec["DB connection check $db_connection_check_command"] -> File[ $start_metastore_path]-> File[ $start_hiveserver2_path]-> Hdp::Exec[$daemon_cmd] -> File[$pid_file] -> Anchor['hdp-hive::service::end']
-    } else {
-      Hdp-hive::Service::Directory<||> -> File[ $start_metastore_path]-> File[ $start_hiveserver2_path]-> Hdp::Exec[$daemon_cmd] -> File[$pid_file] -> Anchor['hdp-hive::service::end']
-    }
-  }
-}
-
-define hdp-hive::service::directory()
-{
-  hdp::directory_recursive_create { $name: 
-    owner => $hdp-hive::params::hive_user,
-    mode => '0755',
-    service_state => $::ensure,
-    force => true
-  }
-}
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/modules/hdp-hive/templates/hive-env.sh.erb
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-hive/templates/hive-env.sh.erb b/ambari-agent/src/main/puppet/modules/hdp-hive/templates/hive-env.sh.erb
deleted file mode 100644
index 80d84f4..0000000
--- a/ambari-agent/src/main/puppet/modules/hdp-hive/templates/hive-env.sh.erb
+++ /dev/null
@@ -1,55 +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.
-
-# Set Hive and Hadoop environment variables here. These variables can be used
-# to control the execution of Hive. It should be used by admins to configure
-# the Hive installation (so that users do not have to set environment variables
-# or set command line parameters to get correct behavior).
-#
-# The hive service being invoked (CLI/HWI etc.) is available via the environment
-# variable SERVICE
-
-# Hive Client memory usage can be an issue if a large number of clients
-# are running at the same time. The flags below have been useful in
-# reducing memory usage:
-#
- if [ "$SERVICE" = "cli" ]; then
-   if [ -z "$DEBUG" ]; then
-     export HADOOP_OPTS="$HADOOP_OPTS -XX:NewRatio=12 -Xms10m -XX:MaxHeapFreeRatio=40 -XX:MinHeapFreeRatio=15 -XX:+UseParNewGC -XX:-UseGCOverheadLimit"
-   else
-     export HADOOP_OPTS="$HADOOP_OPTS -XX:NewRatio=12 -Xms10m -XX:MaxHeapFreeRatio=40 -XX:MinHeapFreeRatio=15 -XX:-UseGCOverheadLimit"
-   fi
- fi
-
-# The heap size of the jvm stared by hive shell script can be controlled via:
-
-export HADOOP_HEAPSIZE="<%=scope.function_hdp_template_var("::hadoop_heapsize")%>"
-export HADOOP_CLIENT_OPTS="-Xmx${HADOOP_HEAPSIZE}m $HADOOP_CLIENT_OPTS"
-
-# Larger heap size may be required when running queries over large number of files or partitions.
-# By default hive shell scripts use a heap size of 256 (MB).  Larger heap size would also be
-# appropriate for hive server (hwi etc).
-
-
-# Set HADOOP_HOME to point to a specific hadoop install directory
-HADOOP_HOME=${HADOOP_HOME:-<%=scope.function_hdp_template_var("::hdp::params::hadoop_home")%>}
-
-# Hive Configuration Directory can be controlled by:
-export HIVE_CONF_DIR=<%=scope.function_hdp_template_var("::hdp-hive::hive_config_dir")%>
-
-# Folder containing extra ibraries required for hive compilation/execution can be controlled by:
-# export HIVE_AUX_JARS_PATH=
-export HIVE_AUX_JARS_PATH=<%=scope.function_hdp_template_var("hive_aux_jars_path")%>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/hue/service_check.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/hue/service_check.pp b/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/hue/service_check.pp
deleted file mode 100644
index cfee202..0000000
--- a/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/hue/service_check.pp
+++ /dev/null
@@ -1,47 +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.
-#
-#
-class hdp-hue::hue::service_check() inherits hdp-hue::params
-{
-  $status_check_cmd = "/etc/init.d/hue status | grep 'is running'"
-  $smoke_test_cmd = "${hue_home_dir}/build/env/bin/hue smoke_test"
-
-  anchor { 'hdp-hue::hue::service_check::begin' : }
-
-  exec { 'hue-status-check':
-    command   => $status_check_cmd,
-    tries     => 3,
-    try_sleep => 5,
-    path      => '/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin',
-    logoutput => "true"
-  }
-
-  exec { 'hue-smoke-test':
-      command   => $smoke_test_cmd,
-      tries     => 3,
-      try_sleep => 5,
-      path      => '/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin',
-      require   => Exec['hue-status-check'],
-      before    => Anchor['hdp-hue::hue::service_check::end'],
-      logoutput => "true"
-    }
-
-  anchor { 'hdp-hue::hue::service_check::end' : }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/init.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/init.pp b/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/init.pp
deleted file mode 100644
index 876f76c..0000000
--- a/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/init.pp
+++ /dev/null
@@ -1,83 +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.
-#
-#
-class hdp-hue(
-  $service_state = undef
-)
-{
-  include $hdp-hue::params
-
-  $hue_user = $hdp-hue::params::hue_server_user
-  $hue_conf_dir = $hdp::params::hue_conf_dir
-
-  if ($service_state == 'uninstalled') {
-
-    hdp::package { 'hue-server':
-      ensure => 'uninstalled'
-    }
-
-    hdp::directory { $hue_config_dir:
-      service_state => $service_state,
-      force => true
-    }
-
-  } else {
-    ## Install package
-    hdp::package { 'hue-server': }
-
-    ## Create user
-    hdp::user{ 'hue_user':
-      user_name => $hue_user
-    }
-
-    ## Create dir
-    hdp::directory_recursive_create { $hue_conf_dir:
-      service_state => $service_state,
-      force => true,
-      owner => $hue_user
-    }
-
-    # Configs generation
-    if has_key($configuration, 'hue-site') {
-      hdp-hue::generate_config_file { 'hue-ini':
-        config_file_path => $hdp-hue::params::hue_conf_file
-      }
-    }
-
-    anchor { 'hdp-hue::begin': } -> Hdp::Package['hue-server'] ->  Hdp::User['hue_user'] -> Hdp::Directory_recursive_create[$hue_conf_dir] -> Hdp-Hue::Generate_config_file<||> -> anchor { 'hdp-hue::end': }
-
-  }
-}
-
-define hdp-hue::generate_config_file(
-  $config_file_path
-)
-{
-  if (hdp_is_empty($configuration) == false and
-    hdp_is_empty($configuration['hue-site']) == false)
-  {
-    ## Create hue.ini file
-    file { $config_file_path :
-      ensure => file,
-      content => template('hdp-hue/hue-ini.cfg.erb'),
-      owner => $hdp-hue::params::hue_server_user
-    }
-  }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/params.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/params.pp b/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/params.pp
deleted file mode 100644
index 533501d..0000000
--- a/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/params.pp
+++ /dev/null
@@ -1,108 +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.
-#
-#
-
-class hdp-hue::params() inherits hdp::params {
-
-  ## Global configuration properties
-
-  $hue_conf_file = "${hdp::params::hue_conf_dir}/hue.ini"
-  $hue_pid_dir = hdp_default("hue_pid_dir", "/var/run/hue")
-  $hue_log_dir = hdp_default("hue_log_dir", "/var/log/hue")
-  $hue_lock_file = hdp_default("hue_lock_file", "/var/lock/subsys/hue")
-  $hue_server_user = hdp_default("hue_user", "hue")
-  $hue_server_group = hdp_default("hue_user_group", "hadoop")
-  $hue_home_dir = hdp_default("hue_home_dir", "/usr/lib/hue")
-
-  # Other properties - not exposed
-
-  $hue_hadoop_home = $hdp::params::hadoop_lib_home
-  $hue_hadoop_mapred_home = $hue_hadoop_home
-  $security_enabled = $hdp::params::security_enabled
-  $hue_hive_conf_dir = $hdp::params::hive_conf_dir
-  $hue_pig_java_home = $hdp::params::java64_home
-  $webhcat_server_host = hdp_default("webhcat_server_host")
-
-  # All non-global properties
-
-  if has_key($configuration, 'hue-site') {
-    $hue-site = $configuration['hue-site']
-
-    # Hadoop Configuration properties
-
-    $hue_hadoop_fs_defaultfs = hdp_get_value_from_map($hue-site, "fs_defaultfs", "")
-    $hue_hadoop_webhdfs_url = hdp_get_value_from_map($hue-site, "webhdfs_url", "")
-    $hue_hadoop_jt_host = hdp_get_value_from_map($hue-site, "jobtracker_host", hdp_default("jtnode_host"))
-    $hue_hadoop_jt_port = hdp_get_value_from_map($hue-site, "jobtracker_port", "50030")
-    $hue_hive_home_dir = hdp_get_value_from_map($hue-site, "hive_home_dir", "/usr/lib/hive")
-    $hue_templeton_url = hdp_get_value_from_map($hue-site, "templeton_url", "http://${webhcat_server_host}:50111/templeton/v1")
-
-    # Database Configuration properties
-
-    $hue_db_engine = hdp_get_value_from_map($hue-site, "db_engine", "")
-    $hue_db_port = hdp_get_value_from_map($hue-site, "db_port", "")
-    $hue_db_host = hdp_get_value_from_map($hue-site, "db_host", "")
-    $hue_db_user = hdp_get_value_from_map($hue-site, "db_user", "")
-    $hue_db_password = hdp_get_value_from_map($hue-site, "db_password", "")
-    $hue_db_name = hdp_get_value_from_map($hue-site, "db_name", "")
-
-    # Hue Email Configuration properties
-
-    $hue_smtp_host = hdp_get_value_from_map($hue-site, "smtp_host", "")
-    $hue_smtp_port = hdp_get_value_from_map($hue-site, "smtp_port", "")
-    $hue_smtp_user = hdp_get_value_from_map($hue-site, "smtp_user", "")
-    $hue_smtp_password = hdp_get_value_from_map($hue-site, "smtp_password", "")
-    $hue_smtp_tls = hdp_get_value_from_map($hue-site, "tls", "no")
-    $hue_default_from_email = hdp_get_value_from_map($hue-site, "default_from_email", "hueadmin@sandbox.com")
-
-    # Hue Configuration properties
-
-    $hue_debug_messages = hdp_get_value_from_map($hue-site, "send_debug_messages", "1")
-    $hue_database_logging = hdp_get_value_from_map($hue-site, "database_logging", "0")
-    $hue_secret_key = hdp_get_value_from_map($hue-site, "secret_key", "ThisisusedforsecurehashinginthesessionstoreSetthistoarandomstringthelongerthebetter")
-    $hue_http_host = hdp_get_value_from_map($hue-site, "http_host", "0.0.0.0")
-    $hue_http_port = hdp_get_value_from_map($hue-site, "http_port", "8000")
-    $hue_time_zone = hdp_get_value_from_map($hue-site, "time_zone", "America/Los_Angeles")
-    $hue_django_debug_mode = hdp_get_value_from_map($hue-site, "django_debug_mode", "1")
-    $hue_use_cherrypy_server = hdp_get_value_from_map($hue-site, "use_cherrypy_server", "false")
-    $hue_http_500_debug_mode = hdp_get_value_from_map($hue-site, "http_500_debug_mode", "1")
-    $hue_backend_auth_policy = hdp_get_value_from_map($hue-site, "backend_auth", "desktop.auth.backend.AllowAllBackend")
-
-    $hue_hadoop_yarn_host = hdp_get_value_from_map($hue-site, "resourcemanager_host", "")
-    $hue_hadoop_yarn_port = hdp_get_value_from_map($hue-site, "resourcemanager_port", "")
-
-    # Shell Configuration properties
-
-    $hue_pig_shell_command = hdp_get_value_from_map($hue-site, "pig_shell_command", "/usr/bin/pig -l /dev/null")
-    $hue_hbase_nice_name = hdp_get_value_from_map($hue-site, "hbase_nice_name", "HBase Shell")
-    $hue_hbase_shell_command = hdp_get_value_from_map($hue-site, "hbase_shell_command", "/usr/bin/hbase shell")
-    $hue_bash_nice_name = hdp_get_value_from_map($hue-site, "bash_nice_name", "Bash (Test only!!!)")
-    $hue_bash_shell_command = hdp_get_value_from_map($hue-site, "bash_shell_command", "/bin/bash")
-
-    $hue_whitelist = hdp_get_value_from_map($hue-site, "whitelist", "(localhost|127\\.0\\.0\\.1):(${jtnode_port}|${namenode_port}|${tasktracker_port}|${datanode_port}|${jobhistory_port})")
-
-    # Security Configuration properties
-
-    $hue_keytab_path = hdp_get_value_from_map($hue-site, "hue_keytab", "${keytab_path}/hue.service.keytab")
-    $hue_principal = hdp_get_value_from_map($hue-site, "hue_principal", "hue/_HOST@${kerberos_domain}")
-
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/server.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/server.pp b/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/server.pp
deleted file mode 100644
index bcbb150..0000000
--- a/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/server.pp
+++ /dev/null
@@ -1,46 +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.
-#
-#
-class hdp-hue::server(
-  $service_state = $hdp::params::cluster_service_state,
-  $setup = false,
-  $opts = {}
-) inherits  hdp-hue::params
-{
-  if ($service_state == 'no_op') {
-  } elsif ($service_state in ['running','stopped','installed_and_configured','uninstalled']) {
-    $hdp::params::service_exists['hdp-hue::server'] = true
-
-    #installs package, creates user, sets configuration
-    class{ 'hdp-hue' :
-      service_state => $service_state,
-    }
-
-    Hdp-hue::Generate_config_file<||>{ config_file_path => $hdp-hue::params::hue_conf_file }
-
-    class { 'hdp-hue::service' :
-      ensure => $service_state
-    }
-
-    #top level does not need anchors
-    Class['hdp-hue'] -> Class['hdp-hue::service']
-    } else {
-      hdp_fail("TODO not implemented yet: service_state = ${service_state}")
-    }
-}

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/service.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/service.pp b/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/service.pp
deleted file mode 100644
index 179337e..0000000
--- a/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/service.pp
+++ /dev/null
@@ -1,76 +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.
-#
-#
-class hdp-hue::service(
-  $ensure,
-  $initial_wait = undef
-)
-{
-  include $hdp-hue::params
-
-  $hue_user = $hdp-hue::params::hue_server_user
-  $hue_start_cmd = "/etc/init.d/hue start --USER=${hue_user} --LOGDIR=${hue_log_dir} --LOCKFILE=${hue_lock_file} --PIDFILE=${hue_pid_dir}/supervisor.pid"
-  $hue_stop_cmd = "/etc/init.d/hue stop"
-
-  $pid_dir = $hdp-hue::params::hue_pid_dir
-  $log_dir = $hdp-hue::params::hue_log_dir
-  $pid_file = "${pid_dir}/supervisor.pid"
-  $no_op_test = "ls ${pid_file} >/dev/null 2>&1 && ps `cat ${pid_file}` >/dev/null 2>&1"
-
-  if ($ensure == 'running') {
-    $daemon_cmd = $hue_start_cmd
-  } elsif ($ensure == 'stopped') {
-    $daemon_cmd = $hue_stop_cmd
-  } else {
-    $daemon_cmd = undef
-  }
-
-  hdp-hue::service::directory { $pid_dir :
-    service_state => $ensure,
-  }
-
-  hdp-hue::service::directory { $log_dir :
-    service_state => $ensure,
-  }
-
-  anchor {'hdp-hue::service::begin': } -> Hdp-hue::Service::Directory<||> -> anchor {'hdp-hue::service::end': }
-
-  if ($daemon_cmd != undef) {
-    hdp::exec { $daemon_cmd:
-      command => $daemon_cmd,
-      unless  => $no_op_test,
-      initial_wait => $initial_wait
-    }
-    Hdp-hue::Service::Directory<||> -> Hdp::Exec[$daemon_cmd] -> Anchor['hdp-hue::service::end']
-  }
-
-}
-
-define hdp-hue::service::directory(
- $service_state
-)
-{
-  hdp::directory_recursive_create { $name:
-    owner => $hdp-hue::params::hue_server_user,
-    mode => '0755',
-    service_state => $service_state,
-    force => true
-  }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/modules/hdp-hue/templates/hue-ini.cfg.erb
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-hue/templates/hue-ini.cfg.erb b/ambari-agent/src/main/puppet/modules/hdp-hue/templates/hue-ini.cfg.erb
deleted file mode 100644
index a263371..0000000
--- a/ambari-agent/src/main/puppet/modules/hdp-hue/templates/hue-ini.cfg.erb
+++ /dev/null
@@ -1,496 +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.
-
-
-# Hue configuration file
-# ===================================
-#
-# For complete documentation about the contents of this file, run
-#       $ <hue_root>/build/env/bin/hue config_help
-#
-# All .ini files under the current directory are treated equally.  Their
-# contents are merged to form the Hue configuration, which can
-# can be viewed on the Hue at
-#       http://<hue_host>:<port>/dump_config
-
-
-###########################################################################
-# General configuration for core Desktop features (authentication, etc)
-###########################################################################
-
-[desktop]
-
-  send_dbug_messages=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_debug_messages")%>
-
-  # To show database transactions, set database_logging to 1
-  database_logging=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_database_logging")%>
-
-  # Set this to a random string, the longer the better.
-  # This is used for secure hashing in the session store.
-  secret_key=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_secret_key")%>
-
-  # Webserver listens on this address and port
-  http_host=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_http_host")%>
-  http_port=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_http_port")%>
-
-  # Time zone name
-  time_zone=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_time_zone")%>
-
-  # Turn off debug
-  django_debug_mode=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_django_debug_mode")%>
-
-  # Turn off backtrace for server error
-  http_500_debug_mode=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_http_500_debug_mode")%>
-
-  # Server email for internal error messages
-  ## django_server_email='hue@localhost.localdomain'
-
-  # Email backend
-  ## django_email_backend=django.core.mail.backends.smtp.EmailBackend
-
-  # Set to true to use CherryPy as the webserver, set to false
-  # to use Spawning as the webserver. Defaults to Spawning if
-  # key is not specified.
-  use_cherrypy_server = <%=scope.function_hdp_template_var("::hdp-hue::params::hue_use_cherrypy_server")%>
-
-  # Webserver runs as this user
-  server_user=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_server_user")%>
-  server_group=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_server_group")%>
-
-  # If set to false, runcpserver will not actually start the web server.
-  # Used if Apache is being used as a WSGI container.
-  ## enable_server=yes
-
-  # Number of threads used by the CherryPy web server
-  #cherrypy_server_threads=2
-
-  # Filename of SSL Certificate
-  ## ssl_certificate=
-
-  # Filename of SSL RSA Private Key
-  ## ssl_private_key=
-
-  # Default encoding for site data
-  ## default_site_encoding=utf-8
-
-  # Administrators
-  # ----------------
-  [[django_admins]]
-    ## [[[admin1]]]
-    ## name=john
-    ## email=john@doe.com
-
-  # UI customizations
-  # -------------------
-  [[custom]]
-
-  # Top banner HTML code
-  ## banner_top_html=
-
-  # Configuration options for user authentication into the web application
-  # ------------------------------------------------------------------------
-  [[auth]]
-
-    # Authentication backend. Common settings are:
-    # - django.contrib.auth.backends.ModelBackend (entirely Django backend)
-    # - desktop.auth.backend.AllowAllBackend (allows everyone)
-    # - desktop.auth.backend.AllowFirstUserDjangoBackend
-    #     (Default. Relies on Django and user manager, after the first login)
-    # - desktop.auth.backend.LdapBackend
-    # - desktop.auth.backend.PamBackend
-    backend=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_backend_auth_policy")%>
-
-    ## pam_service=login
-
-  # Configuration options for connecting to LDAP and Active Directory
-  # -------------------------------------------------------------------
-  [[ldap]]
-
-  # The search base for finding users and groups
-  ## base_dn="DC=mycompany,DC=com"
-
-  # The NT domain to connect to (only for use with Active Directory)
-  ## nt_domain=mycompany.com
-
-  # URL of the LDAP server
-  ## ldap_url=ldap://auth.mycompany.com
-
-  # Path to certificate for authentication over TLS
-  ## ldap_cert=
-
-  # Distinguished name of the user to bind as -- not necessary if the LDAP server
-  # supports anonymous searches
-  ## bind_dn="CN=ServiceAccount,DC=mycompany,DC=com"
-
-  # Password of the bind user -- not necessary if the LDAP server supports
-  # anonymous searches
-  ## bind_password=
-
-  # Pattern for searching for usernames -- Use <username> for the parameter
-  # For use when using LdapBackend for Hue authentication
-  ## ldap_username_pattern="uid=<username>,ou=People,dc=mycompany,dc=com"
-
-      [[[users]]]
-
-      # Base filter for searching for users
-      ## user_filter="objectclass=*"
-
-      # The username attribute in the LDAP schema
-      ## user_name_attr=sAMAccountName
-
-      [[[groups]]]
-
-      # Base filter for searching for groups
-      ## group_filter="objectclass=*"
-
-      # The username attribute in the LDAP schema
-      ## group_name_attr=cn
-
-  # Configuration options for specifying the Desktop Database.  For more info,
-  # see http://docs.djangoproject.com/en/1.1/ref/settings/#database-engine
-  # ------------------------------------------------------------------------
-  [[database]]
-    # Database engine is typically one of:
-    # postgresql, mysql, sqlite3, or oracle
-    #
-    # Note that for sqlite3, 'name', below is a filename;
-    # for other backends, it is the database name.
-  <% if scope.function_hdp_template_var("::hdp-hue::params::hue_db_engine") != "" %>
-    engine=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_db_engine")%>
-    host=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_db_port")%>
-    port=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_db_host")%>
-    user=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_db_user")%>
-    password=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_db_password")%>
-    name=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_db_name")%>
-  <% end %>
-
-
-  # Configuration options for connecting to an external SMTP server
-  # ------------------------------------------------------------------------
-  [[smtp]]
-
-  <% if scope.function_hdp_template_var("::hdp-hue::params::hue_smtp_host") != "" %>
-    # The SMTP server information for email notification delivery
-    host=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_smtp_host")%>
-    port=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_smtp_port")%>
-    user=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_smtp_user")%>
-    password=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_smtp_password")%>
-  <% end %>
-
-    # Whether to use a TLS (secure) connection when talking to the SMTP server
-    tls=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_smtp_tls")%>
-
-    # Default email address to use for various automated notification from Hue
-    default_from_email=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_default_from_email")%>
-
-
-  # Configuration options for Kerberos integration for secured Hadoop clusters
-  # ------------------------------------------------------------------------
-  [[kerberos]]
-
-  <% if scope.function_hdp_template_var("::hdp::params::security_enabled") == true %>
-    # Path to Hue's Kerberos keytab file
-    hue_keytab=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_keytab_path")%>
-    # Kerberos principal name for Hue
-    hue_principal=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_principal")%>
-    # Path to kinit
-    kinit_path=<%=scope.function_hdp_template_var("::hdp::params::kinit_path_local")%>
-  <% end %>
-
-###########################################################################
-# Settings to configure your Hadoop cluster.
-###########################################################################
-
-[hadoop]
-
-  # Configuration for HDFS NameNode
-  # ------------------------------------------------------------------------
-  [[hdfs_clusters]]
-
-    [[[default]]]
-      # Enter the filesystem uri
-      fs_defaultfs=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_hadoop_fs_defaultfs")%>
-
-      # Use WebHdfs/HttpFs as the communication mechanism. To fallback to
-      # using the Thrift plugin (used in Hue 1.x), this must be uncommented
-      # and explicitly set to the empty value.
-      webhdfs_url=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_hadoop_webhdfs_url")%>
-
-      security_enabled=<%=scope.function_hdp_template_var("::hdp-hue::params::security_enabled")%>
-
-      # Settings about this HDFS cluster. If you install HDFS in a
-      # different location, you need to set the following.
-
-      # Defaults to $HADOOP_HDFS_HOME or /usr/lib/hadoop-hdfs
-      hadoop_hdfs_home=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_hadoop_home")%>
-
-      # Defaults to $HADOOP_BIN or /usr/bin/hadoop
-      ## hadoop_bin=/usr/bin/hadoop
-
-      # Defaults to $HADOOP_CONF_DIR or /etc/hadoop/conf
-      ## hadoop_conf_dir=/etc/hadoop/conf
-
-  # Configuration for MapReduce JobTracker
-  # ------------------------------------------------------------------------
-  [[mapred_clusters]]
-
-    [[[default]]]
-      # Enter the host on which you are running the Hadoop JobTracker
-      jobtracker_host=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_hadoop_jt_host")%>
-      # The port where the JobTracker IPC listens on
-      jobtracker_port=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_hadoop_jt_port")%>
-      # Thrift plug-in port for the JobTracker
-      ## thrift_port=9290
-      # Whether to submit jobs to this cluster
-      ## submit_to=False
-
-      ## security_enabled=false
-
-      # Settings about this MR1 cluster. If you install MR1 in a
-      # different location, you need to set the following.
-
-      # Defaults to $HADOOP_MR1_HOME or /usr/lib/hadoop-0.20-mapreduce
-      hadoop_mapred_home=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_hadoop_mapred_home")%>
-
-      # Defaults to $HADOOP_BIN or /usr/bin/hadoop
-      ## hadoop_bin=/usr/bin/hadoop
-
-      # Defaults to $HADOOP_CONF_DIR or /etc/hadoop/conf
-      ## hadoop_conf_dir=/etc/hadoop/conf
-
-  # Configuration for Yarn
-  # ------------------------------------------------------------------------
-  [[yarn_clusters]]
-
-    [[[default]]]
-      # Enter the host on which you are running the ResourceManager
-      resourcemanager_host=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_hadoop_yarn_host")%>
-      # The port where the ResourceManager IPC listens on
-      resourcemanager_port=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_hadoop_yarn_port")%>
-      # Whether to submit jobs to this cluster
-      ## submit_to=False
-
-      ## security_enabled=false
-
-      # Settings about this MR2 cluster. If you install MR2 in a
-      # different location, you need to set the following.
-
-      # Defaults to $HADOOP_MR2_HOME or /usr/lib/hadoop-mapreduce
-      hadoop_mapred_home=/usr/lib/hadoop/lib
-
-      # Defaults to $HADOOP_BIN or /usr/bin/hadoop
-      ## hadoop_bin=/usr/bin/hadoop
-
-      # Defaults to $HADOOP_CONF_DIR or /etc/hadoop/conf
-      ## hadoop_conf_dir=/etc/hadoop/conf
-
-
-###########################################################################
-# Settings to configure liboozie
-###########################################################################
-
-[liboozie]
-  # The URL where the Oozie service runs on. This is required in order for
-  # users to submit jobs.
-  ## oozie_url=http://localhost:11000/oozie
-
-  ## security_enabled=false
-
-  # Location on HDFS where the workflows/coordinator are deployed when submitted.
-  ## remote_deployement_dir=/user/hue/oozie/deployments
-
-
-###########################################################################
-# Settings to configure the Oozie app
-###########################################################################
-
-[oozie]
-  # Location on local FS where the examples are stored.
-  ## local_data_dir=..../examples
-
-  # Location on local FS where the data for the examples is stored.
-  ## sample_data_dir=...thirdparty/sample_data
-
-  # Location on HDFS where the oozie examples and workflows are stored.
-  ## remote_data_dir=/user/hue/oozie/workspaces
-
-  # Share workflows and coordinators information with all users. If set to false,
-  # they will be visible only to the owner and administrators.
-  ## share_jobs=True
-
-  # Maximum of Oozie workflows or coodinators to retrieve in one API call.
-  ## oozie_jobs_count=100
-
-
-###########################################################################
-# Settings to configure Beeswax
-###########################################################################
-
-[beeswax]
-
-  # Deprecated! Will be removed in Hue 3
-  # Multiple sections are now available in query_servers
-  # Host where Beeswax internal metastore Thrift daemon is running
-  ## beeswax_meta_server_host=localhost
-
-  # Deprecated! Will be removed in Hue 3
-  # Multiple sections are now available in query_servers
-  # Configure the port the internal metastore daemon runs on. Used only if
-  # hive.metastore.local is true.
-  ## beeswax_meta_server_port=8003
-
-  # Host where Beeswax internal metastore Thrift daemon is running
-  ## beeswax_meta_server_host=localhost
-
-  # Configure the port the internal metastore daemon runs on. Used only if
-  # hive.metastore.local is true.
-  ## beeswax_meta_server_port=8003
-
-  # Hive home directory
-  hive_home_dir=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_hive_home_dir")%>
-
-  # Hive configuration directory, where hive-site.xml is located
-  hive_conf_dir=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_hive_conf_dir")%>
-
-  # Timeout in seconds for thrift calls to beeswax service
-  ## beeswax_server_conn_timeout=120
-
-  # Timeout in seconds for thrift calls to the hive metastore
-  ## metastore_conn_timeout=10
-
-  # Maximum Java heapsize (in megabytes) used by Beeswax Server.
-  # Note that the setting of HADOOP_HEAPSIZE in $HADOOP_CONF_DIR/hadoop-env.sh
-  # may override this setting.
-  ## beeswax_server_heapsize=1000
-
-  # Share saved queries with all users. If set to false, saved queries are
-  # visible only to the owner and administrators.
-  ## share_saved_queries=true
-
- # One entry for each Query Server that can execute some SQL queries.
- # This must be in the bottom of the [beewax] section.
- [[query_servers]]
-
-   [[[default]]]
-   # Host where the Query Server Thrift daemon is running
-   ## server_host=localhost
-   # Configure the port the Query Server Thrift server
-   ## server_port=8002
-   # If DDL queries are supported (e.g. DROP can be sent directly to this server)
-   ## support_ddl=True
-
-###########################################################################
-# Settings to configure Job Designer
-###########################################################################
-
-[jobsub]
-  # Location on HDFS where the jobsub examples and templates are stored.
-  ## remote_data_dir=/user/hue/jobsub
-
-  # Location on local FS where examples and template are stored.
-  ## local_data_dir=..../data
-
-  # Location on local FS where sample data is stored
-  ## sample_data_dir=...thirdparty/sample_data
-
-
-###########################################################################
-# Settings to configure Job Browser
-###########################################################################
-
-[jobbrowser]
-  # Share submitted jobs information with all users. If set to false,
-  # submitted jobs are visible only to the owner and administrators.
-  ## share_jobs=true
-
-
-###########################################################################
-# Settings to configure the Shell application
-###########################################################################
-
-[shell]
-  # The shell_buffer_amount specifies the number of bytes of output per shell
-  # that the Shell app will keep in memory. If not specified, it defaults to
-  # 524288 (512 MiB).
-  ## shell_buffer_amount=100
-
-  # If you run Hue against a Hadoop cluster with Kerberos security enabled, the
-  # Shell app needs to acquire delegation tokens for the subprocesses to work
-  # correctly. These delegation tokens are stored as temporary files in some
-  # directory. You can configure this directory here. If not specified, it
-  # defaults to /tmp/hue_delegation_tokens.
-  ## shell_delegation_token_dir=/tmp/hue_delegation_tokens
-
-  [[ shelltypes ]]
-
-    # Define and configure a new shell type "flume"
-    # ------------------------------------------------------------------------
-    #[[[ flume ]]]
-    #  nice_name = "Flume Shell"
-    # command = "/usr/bin/flume shell"
-    # help = "The command-line Flume client interface."
-
-    #  [[[[ environment ]]]]
-        # You can specify environment variables for the Flume shell
-        # in this section.
-
-    # Define and configure a new shell type "pig"
-    # ------------------------------------------------------------------------
-    [[[ pig ]]]
-      nice_name = "Pig Shell (Grunt)"
-      command = <%=scope.function_hdp_template_var("::hdp-hue::params::hue_pig_shell_command")%>
-      help = "The command-line interpreter for Pig"
-
-      [[[[ environment ]]]]
-        # You can specify environment variables for the Pig shell
-        # in this section. Note that JAVA_HOME must be configured
-        # for the Pig shell to run.
-
-        [[[[[ JAVA_HOME ]]]]]
-          value = <%=scope.function_hdp_template_var("::hdp-hue::params::hue_pig_java_home")%>
-
-    # Define and configure a new shell type "hbase"
-    # ------------------------------------------------------------------------
-    [[[ hbase ]]]
-      nice_name = "HBase Shell"
-      command = <%=scope.function_hdp_template_var("::hdp-hue::params::hue_hbase_shell_command")%>
-      help = "The command-line HBase client interface."
-
-      [[[[ environment ]]]]
-        # You can configure environment variables for the HBase shell
-        # in this section.
-
-    # Define and configure a new shell type "bash" for testing only
-    # ------------------------------------------------------------------------
-    [[[ bash ]]]
-      nice_name = "Bash (Test only!!!)"
-      command = <%=scope.function_hdp_template_var("::hdp-hue::params::hue_bash_shell_command")%>
-      help = "A shell that does not depend on Hadoop components"
-
-
-###########################################################################
-# Settings for the User Admin application
-###########################################################################
-
-[useradmin]
-  # The name of the default user group that users will be a member of
-  ## default_user_group=default
-
-[hcatalog]
-  templeton_url=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_templeton_url")%>
-
-[proxy]
-whitelist=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_whitelist")%>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/modules/hdp-kerberos/lib/facter/kadm_keytab.rb
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-kerberos/lib/facter/kadm_keytab.rb b/ambari-agent/src/main/puppet/modules/hdp-kerberos/lib/facter/kadm_keytab.rb
deleted file mode 100644
index 0b63bf9..0000000
--- a/ambari-agent/src/main/puppet/modules/hdp-kerberos/lib/facter/kadm_keytab.rb
+++ /dev/null
@@ -1,21 +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.
-
-require 'facter'
-Facter.add("kadm_keytab") do
-  setcode do
-     %x{[ -f /etc/kadm5.keytab ] && base64 </etc/kadm5.keytab 2>/dev/null} + "\n"
-  end
-end

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/modules/hdp-kerberos/lib/puppet/parser/functions/kerberos_keytabs_input.rb
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-kerberos/lib/puppet/parser/functions/kerberos_keytabs_input.rb b/ambari-agent/src/main/puppet/modules/hdp-kerberos/lib/puppet/parser/functions/kerberos_keytabs_input.rb
deleted file mode 100644
index 406cb2c..0000000
--- a/ambari-agent/src/main/puppet/modules/hdp-kerberos/lib/puppet/parser/functions/kerberos_keytabs_input.rb
+++ /dev/null
@@ -1,34 +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.
-#
-#
-
-module Puppet::Parser::Functions
-  newfunction(:kerberos_keytabs_input, :type => :rvalue) do |args|
-    fqdn,node_components,keytab_map = args 
-    ndx_ret = Hash.new
-    node_components.each do |cmp|
-      if info = keytab_map[cmp]
-        keytab = info["keytab"]
-        ndx_ret[keytab] ||= {"keytab" => keytab, "principals" => info["primaries"].map{|p|"#{p}/#{fqdn}"}}
-      end
-    end
-    ndx_ret.values
-  end
-end

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/modules/hdp-kerberos/manifests/adminclient.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-kerberos/manifests/adminclient.pp b/ambari-agent/src/main/puppet/modules/hdp-kerberos/manifests/adminclient.pp
deleted file mode 100644
index 9176de3..0000000
--- a/ambari-agent/src/main/puppet/modules/hdp-kerberos/manifests/adminclient.pp
+++ /dev/null
@@ -1,140 +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.
-#
-#
-
-class hdp-kerberos::adminclient(
-  $service_state = $hdp::params::cluster_service_state
-) inherits hdp-kerberos::params
-{
-  import 'hdp'
-
-  $kadmin_pw = "bla123"
-  $kadmin_admin = "kadmin/admin"
-  $realm = $kerberos_domain
-  $krb_realm = $kerberos_domain
-  $hdp::params::service_exists['hdp-kerberos::adminclient'] = true
-  $krbContext = {}
-  $krbContext['kadmin_pw'] = $kadmin_pw
-  $krbContext['kadmin_admin'] = $kadmin_admin
-  $krbContext['realm' ] = $kerberos_domain
-  $krbContext['local_or_remote'] = 'remote'
-  $krbContext['principals_to_create'] = $principals_to_create
-  $krbContext['keytabs_to_create'] = $keytabs_to_create
-  $krbContext['principals_in_keytabs'] = $principals_in_keytabs
-
-  $kdc_server = $kdc_host
-
-  package { $package_name_client:
-    ensure => installed,
-  }
-  if ($hdp::params::service_exists['hdp-kerberos::server'] != true) {
-    file { "/etc/krb5.conf":
-      content => template('hdp-kerberos/krb5.conf'),
-      owner => "root",
-      group => "root",
-      mode => "0644",
-      require => Package[$package_name_client],
-    }
-  }
- 
-  if ($create_principals_keytabs == "yes") {
-    notice("Creating principals and keytabs..")
-    hdp-kerberos::principals_and_keytabs::services { 'alphabeta': 
-      krb_context => $krbContext
-    }
-  }
-}
-
-
-define hdp-kerberos::principals_and_keytabs::services(
-  $krb_context
-)
-{
-  include hdp-kerberos::params
-  $principals_to_create = $krb_context[principals_to_create]
-  $keytabs_to_create = $krb_context[keytabs_to_create]
-
-  hdp-kerberos::principal {$principals_to_create:
-    krb_context => $krb_context,
-  }
-  
-  hdp-kerberos::keytab { $keytabs_to_create :
-    krb_context => $krb_context,
-    require => Hdp-kerberos::Principal[$principals_to_create]
-  }
-}
-
-define hdp-kerberos::keytab(
-  $krb_context,
-  $keytable_file_owner = undef,
-  $keytable_file_mode  = undef
-)
-{
-  include hdp-kerberos::params
-  $keytab = $name
-  $realm = $krb_context['realm']
-  $local_or_remote = $krb_context['local_or_remote']
-  $kadmin_pw = $krb_context['kadmin_pw']
-  $kadmin_admin = $krb_context['kadmin_admin']
-  $kadmin_cmd = "kadmin -w ${kadmin_pw} -p ${kadmin_admin}"
-  if ($local_or_remote == 'local') {
-    $kadmin_cmd = 'kadmin.local'
-  }
-  $principals_in_keytabs = $krb_context['principals_in_keytabs']
-
-  $principals = $principals_in_keytabs[$keytab]
-  $principals_list = inline_template("<%= principals.join(' ')%>")
-  $keytab_filename = $keytab
-
-  exec { "xst ${keytab}":
-    command => "rm -rf ${keytab_filename}; ${kadmin_cmd} -q 'xst -k ${keytab_filename} ${principals_list}'; chown puppet:apache ${keytab_filename}",
-    unless  => "klist -kt ${keytab_filename} 2>/dev/null | grep -q ' ${principals[0]}'", #TODO may make more robust test
-    path   => $hdp-kerberos::params::exec_path,
-  }
-
-  if (($keytable_file_owner != undef) or ($keytable_file_mode != undef)) {
-    file { $keytab_filename:
-      owner => $keytable_file_owner,
-      mode  => $keytable_file_mode,
-      require => Exec["xst ${keytab}"]
-    }
-  }
-}
-
-define hdp-kerberos::principal(
-  $krb_context
-)
-{
-  include hdp-kerberos::params
-  $realm = $krb_context['realm']
-  $local_or_remote = $krb_context['local_or_remote']
-  $kadmin_pw = $krb_context['kadmin_pw']
-  $kadmin_admin = $krb_context['kadmin_admin']
-  $kadmin_cmd =  "kadmin -w ${kadmin_pw} -p ${kadmin_admin}"
-  if ($local_or_remote == 'local') {
-    $kadmin_cmd = 'kadmin.local'
-  }
-  $principal = $name
-  exec { "addprinc ${principal}":
-    command => "${kadmin_cmd} -q 'addprinc -randkey ${principal}'",
-    unless => "${kadmin_cmd} -q listprincs | grep -q '^${principal}$'",
-    path => $hdp-kerberos::params::exec_path
-  }
-}

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/modules/hdp-kerberos/manifests/bigtop/init.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-kerberos/manifests/bigtop/init.pp b/ambari-agent/src/main/puppet/modules/hdp-kerberos/manifests/bigtop/init.pp
deleted file mode 100644
index 2b3e162..0000000
--- a/ambari-agent/src/main/puppet/modules/hdp-kerberos/manifests/bigtop/init.pp
+++ /dev/null
@@ -1,217 +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.
-
-class kerberos {
-  class site {
-    # The following is our interface to the world. This is what we allow
-    # users to tweak from the outside (see tests/init.pp for a complete
-    # example) before instantiating target classes.
-    # Once we migrate to Puppet 2.6 we can potentially start using 
-    # parametrized classes instead.
-    $domain     = $kerberos_domain     ? { '' => inline_template('<%= domain %>'),
-                                           default => $kerberos_domain }
-    $realm      = $kerberos_realm      ? { '' => inline_template('<%= domain.upcase %>'),
-                                           default => $kerberos_realm } 
-    $kdc_server = $kerberos_kdc_server ? { '' => 'localhost',
-                                           default => $kerberos_kdc_server }
-    $kdc_port   = $kerberos_kdc_port   ? { '' => '88', 
-                                           default => $kerberos_kdc_port } 
-    $admin_port = 749 /* BUG: linux daemon packaging doesn't let us tweak this */
-
-    $keytab_export_dir = "/var/lib/bigtop_keytabs"
-
-    case $operatingsystem {
-        'ubuntu': {
-            $package_name_kdc    = 'krb5-kdc'
-            $service_name_kdc    = 'krb5-kdc'
-            $package_name_admin  = 'krb5-admin-server'
-            $service_name_admin  = 'krb5-admin-server'
-            $package_name_client = 'krb5-user'
-            $exec_path           = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
-            $kdc_etc_path        = '/etc/krb5kdc/'
-        }
-        # default assumes CentOS, Redhat 5 series (just look at how random it all looks :-()
-        default: {
-            $package_name_kdc    = 'krb5-server'
-            $service_name_kdc    = 'krb5kdc'
-            $package_name_admin  = 'krb5-libs'
-            $service_name_admin  = 'kadmin'
-            $package_name_client = 'krb5-workstation'
-            $exec_path           = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/kerberos/sbin:/usr/kerberos/bin'
-            $kdc_etc_path        = '/var/kerberos/krb5kdc/'
-        }
-    }
-
-    file { "/etc/krb5.conf":
-      content => template('kerberos/krb5.conf'),
-      owner => "root",
-      group => "root",
-      mode => "0644",
-    }
-
-    @file { $keytab_export_dir:
-      ensure => directory,
-      owner  => "root",
-      group  => "root",
-    }
-
-    # Required for SPNEGO
-    @principal { "HTTP": 
-
-    }
-  }
-
-  class kdc inherits kerberos::site {
-    package { $package_name_kdc:
-      ensure => installed,
-    }
-
-    file { $kdc_etc_path:
-    	ensure => directory,
-        owner => root,
-        group => root,
-        mode => "0700",
-        require => Package["$package_name_kdc"],
-    }
-    file { "${kdc_etc_path}/kdc.conf":
-      content => template('kerberos/kdc.conf'),
-      require => Package["$package_name_kdc"],
-      owner => "root",
-      group => "root",
-      mode => "0644",
-    }
-    file { "${kdc_etc_path}/kadm5.acl":
-      content => template('kerberos/kadm5.acl'),
-      require => Package["$package_name_kdc"],
-      owner => "root",
-      group => "root",
-      mode => "0644",
-    }
-
-    exec { "kdb5_util":
-      path => $exec_path,
-      command => "rm -f /etc/kadm5.keytab ; kdb5_util -P cthulhu -r ${realm} create -s && kadmin.local -q 'cpw -pw secure kadmin/admin'",
-      
-      creates => "${kdc_etc_path}/stash",
-
-      subscribe => File["${kdc_etc_path}/kdc.conf"],
-      # refreshonly => true, 
-
-      require => [Package["$package_name_kdc"], File["${kdc_etc_path}/kdc.conf"], File["/etc/krb5.conf"]],
-    }
-
-    service { $service_name_kdc:
-      ensure => running,
-      require => [Package["$package_name_kdc"], File["${kdc_etc_path}/kdc.conf"], Exec["kdb5_util"]],
-      subscribe => File["${kdc_etc_path}/kdc.conf"],
-      hasrestart => true,
-    }
-
-
-    class admin_server inherits kerberos::kdc {
-      $se_hack = "setsebool -P kadmind_disable_trans  1 ; setsebool -P krb5kdc_disable_trans 1"
-
-      package { "$package_name_admin":
-        ensure => installed,
-        require => Package["$package_name_kdc"],
-      } 
-  
-      service { "$service_name_admin":
-        ensure => running,
-        require => [Package["$package_name_admin"], Service["$service_name_kdc"]],
-        hasrestart => true,
-        restart => "${se_hack} ; service ${service_name_admin} restart",
-        start => "${se_hack} ; service ${service_name_admin} start",
-      }
-    }
-  }
-
-  class client inherits kerberos::site {
-    package { $package_name_client:
-      ensure => installed,
-    }
-  }
-
-  class server {
-    include kerberos::client
-
-    class { "kerberos::kdc": } 
-    ->
-    Class["kerberos::client"] 
-
-    class { "kerberos::kdc::admin_server": }
-    -> 
-    Class["kerberos::client"]
-  }
-
-  define principal {
-    require "kerberos::client"
-
-    realize(File[$kerberos::site::keytab_export_dir])
-
-    $principal = "$title/$hdp::params::hostname"
-    $keytab    = "$kerberos::site::keytab_export_dir/$title.keytab"
-
-    exec { "addprinc.$title":
-      path => $kerberos::site::exec_path,
-      command => "kadmin -w secure -p kadmin/admin -q 'addprinc -randkey $principal'",
-      unless => "kadmin -w secure -p kadmin/admin -q listprincs | grep -q $principal",
-      require => Package[$kerberos::site::package_name_client],
-    } 
-    ->
-    exec { "xst.$title":
-      path    => $kerberos::site::exec_path, 
-      command => "kadmin -w secure -p kadmin/admin -q 'xst -k $keytab $principal'",
-      unless  => "klist -kt $keytab 2>/dev/null | grep -q $principal",
-      require => File[$kerberos::site::keytab_export_dir],
-    }
-  }
-
-  define host_keytab($princs = undef, $spnego = disabled) {
-    $keytab = "/etc/$title.keytab"
-
-    $requested_princs = $princs ? { 
-      undef   => [ $title ],
-      default => $princs,
-    }
-
-    $internal_princs = $spnego ? {
-      /(true|enabled)/ => [ 'HTTP' ],
-      default          => [ ],
-    }
-    realize(Kerberos::Principal[$internal_princs])
-
-    $includes = inline_template("<%=
-      [requested_princs, internal_princs].flatten.map { |x|
-        \"rkt $kerberos::site::keytab_export_dir/#{x}.keytab\"
-      }.join(\"\n\")
-    %>")
-
-    kerberos::principal { $requested_princs:
-    }
-
-    exec { "ktinject.$title":
-      path     => $kerberos::site::exec_path,
-      command  => "/usr/bin/ktutil <<EOF
-        $includes
-        wkt $keytab
-EOF
-        chown $title $keytab",
-      creates => $keytab,
-      require => [ Kerberos::Principal[$requested_princs],
-                   Kerberos::Principal[$internal_princs] ],
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/modules/hdp-kerberos/manifests/client.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-kerberos/manifests/client.pp b/ambari-agent/src/main/puppet/modules/hdp-kerberos/manifests/client.pp
deleted file mode 100644
index b77585f..0000000
--- a/ambari-agent/src/main/puppet/modules/hdp-kerberos/manifests/client.pp
+++ /dev/null
@@ -1,50 +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.
-#
-#
-
-class hdp-kerberos::client(
-  $service_state = $hdp::params::cluster_service_state
-) inherits hdp-kerberos::params
-{
-  import 'hdp'
-
-  $hdp::params::service_exists['hdp-kerberos::client'] = true
-
-  $kdc_server = $kdc_host
-  $krb_realm = $kerberos_domain
-  $realm = $kerberos_domain
-
-  if ($hdp::params::service_exists['hdp-kerberos::adminclient'] != true)  {
-    package { $package_name_client:
-      ensure => installed,
-    }
-  }
-
-  if (($hdp::params::service_exists['hdp-kerberos::server'] != true) and
-      ($hdp::params::service_exists['hdp-kerberos::adminclient'] != true) ) {
-    file { "/etc/krb5.conf":
-      content => template('hdp-kerberos/krb5.conf'),
-      owner => "root",
-      group => "root",
-      mode => "0644",
-      require => Package[$package_name_client],
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/modules/hdp-kerberos/manifests/init.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-kerberos/manifests/init.pp b/ambari-agent/src/main/puppet/modules/hdp-kerberos/manifests/init.pp
deleted file mode 100644
index 70ed6ef..0000000
--- a/ambari-agent/src/main/puppet/modules/hdp-kerberos/manifests/init.pp
+++ /dev/null
@@ -1,25 +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.
-#
-#
-
-class hdp-kerberos()
-{
-}
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/modules/hdp-kerberos/manifests/params.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-kerberos/manifests/params.pp b/ambari-agent/src/main/puppet/modules/hdp-kerberos/manifests/params.pp
deleted file mode 100644
index 599b8e0..0000000
--- a/ambari-agent/src/main/puppet/modules/hdp-kerberos/manifests/params.pp
+++ /dev/null
@@ -1,70 +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.
-#
-#
-
-class hdp-kerberos::params(
-) inherits hdp::params
-{
-  $domain  = 'hadoop.com'
-  $realm = inline_template('<%= @domain.upcase %>')
-  $kdc_server = $hdp::params::hostname
-  $kdc_port = 88
-  $keytab_export_base_dir = '/etc/security/'
-  $keytab_export_dir = "${keytab_export_base_dir}/keytabs"
-
-  $keytab_map = {
-    'hdp-hadoop::namenode' =>  
-      {keytab    => 'nn.service.keytab',
-       primaries => ['nn', 'host', 'HTTP']},
-    'hdp-hadoop::snamenode' =>  
-      {keytab    => 'nn.service.keytab',
-       primaries => ['nn', 'host', 'HTTP']},
-    'hdp-hadoop::datanode' =>  
-      {keytab    => 'dn.service.keytab',
-       primaries => ['dn']},
-    'hdp-hadoop::jobtracker' =>  
-      {keytab    => 'jt.service.keytab',
-       primaries => ['jt']},
-    'hdp-hadoop::tasktracker' =>  
-      {keytab    => 'tt.service.keytab',
-       primaries => ['tt']}
-  }
-
-  case $::operatingsystem {
-    'ubuntu': {
-      $package_name_kdc    = 'krb5-kdc'
-      $service_name_kdc    = 'krb5-kdc'
-      $package_name_admin  = 'krb5-admin-server'
-      $service_name_admin  = 'krb5-admin-server'
-      $package_name_client = 'krb5-user'
-      $exec_path           = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
-      $kdc_etc_path        = '/etc/krb5kdc/'
-     }
-     default: {
-       $package_name_kdc    = 'krb5-server'
-       $service_name_kdc    = 'krb5kdc'
-       $package_name_admin  = 'krb5-libs'
-       $service_name_admin  = 'kadmin'
-       $package_name_client = 'krb5-workstation' 
-       $exec_path           = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/kerberos/sbin:/usr/kerberos/bin'
-       $kdc_etc_path        = '/var/kerberos/krb5kdc/'
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/modules/hdp-kerberos/manifests/server.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-kerberos/manifests/server.pp b/ambari-agent/src/main/puppet/modules/hdp-kerberos/manifests/server.pp
deleted file mode 100644
index ae2f421..0000000
--- a/ambari-agent/src/main/puppet/modules/hdp-kerberos/manifests/server.pp
+++ /dev/null
@@ -1,116 +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.
-#
-#
-
-class hdp-kerberos::server(
-  $service_state = $hdp::params::cluster_service_state,
-  $opts = {}
-) inherits hdp-kerberos::params
-{ 
-  import 'hdp'
-
-  $hdp::params::service_exists['hdp-kerberos::server'] = true
-
-  $krb_realm = $kerberos_domain
-  $kadmin_pw = "bla123"
-  $kadmin_admin = "kadmin/admin"
-
-  if ($service_state == 'no_op') {
-  } elsif ($service_state in ['running','stopped','installed_and_configured']) {
-    # Install kdc server and client
-    package { $package_name_kdc:
-      ensure => installed
-    }
-
-    # set the realm
-    $realm = $krb_realm
-    # SUHAS: This should be set on all the nodes in addition to kdc server
-    file { "/etc/krb5.conf":
-      content => template('hdp-kerberos/krb5.conf'),
-      owner => "root",
-      group => "root",
-      mode => "0644",
-      require => Package[$package_name_kdc],
-      }
-
-    file { $kdc_etc_path:
-      ensure => directory,
-      owner => root,
-      group => root,
-      mode => "0700",
-      require => Package[$package_name_kdc],
-    }
-
-    file { "${kdc_etc_path}/kdc.conf":
-      content => template('hdp-kerberos/kdc.conf'),
-      require => Package["$package_name_kdc"],
-      owner => "root",
-      group => "root",
-      mode => "0644",
-    }
-
-    # SUHAS: kadm5.acl file template is missing in gsInsaller
-    # SUHAS: gsInstaller stops stopIptables at this point (sequence is not relevant here).
-    file { "${kdc_etc_path}/kadm5.acl":
-      content => template('hdp-kerberos/kadm5.acl'),
-      require => Package["$package_name_kdc"],
-      owner => "root",
-      group => "root",
-      mode => "0644",
-    }
-
-    exec { "kdb5_util":
-      path => $exec_path,
-      command => "rm -f ${kdc_etc_path}/kadm5.keytab; kdb5_util -P x86yzh12 -r ${realm} create -s && kadmin.local -q 'cpw -pw ${kadmin_pw} ${kadmin_admin}'",
-      creates => "${kdc_etc_path}/stash",
-      subscribe => File["${kdc_etc_path}/kdc.conf"],
-      require => [Package[$package_name_kdc], File["${kdc_etc_path}/kdc.conf"], File["/etc/krb5.conf"]]
-    }
-
-    # SUHAS: gsInstaller has checkconfig_on
-    exec { "chkconfig_krb5kdc_on":
-      path => $exec_path,
-      command => "chkconfig krb5kdc on",
-      require => [Package["$package_name_kdc"], File["${kdc_etc_path}/kdc.conf"], Exec["kdb5_util"]],
-    }
-    
-    # Start KDC Server
-    if ($service_state in ['running','stopped']) {
-      service { $service_name_kdc:
-        ensure => $service_state,
-        require => [Exec["chkconfig_krb5kdc_on"]],
-        subscribe => File["${kdc_etc_path}/kdc.conf"],
-        hasrestart => true,
-      }
-
-      # SUHAS: This is to be done on HMC not KDC Server??
-      $se_hack = "setsebool -P kadmind_disable_trans  1 ; setsebool -P krb5kdc_disable_trans 1"
-      service { $service_name_admin:
-        ensure => $service_state,
-        require => Service[$service_name_kdc],
-        hasrestart => true,
-        restart => "${se_hack} ; service ${service_name_admin} restart",
-        start => "${se_hack} ; service ${service_name_admin} start",
-      }
-    }
-  } else {
-    hdp_fail("TODO not implemented yet: service_state = ${service_state}")
-  }
-}

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/modules/hdp-kerberos/templates/kadm5.acl
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-kerberos/templates/kadm5.acl b/ambari-agent/src/main/puppet/modules/hdp-kerberos/templates/kadm5.acl
deleted file mode 100644
index d91d076..0000000
--- a/ambari-agent/src/main/puppet/modules/hdp-kerberos/templates/kadm5.acl
+++ /dev/null
@@ -1,21 +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.
-
-# This file Is the access control list for krb5 administration.
-# When this file is edited run /etc/init.d/krb5-admin-server restart to activate
-# One common way to set up Kerberos administration is to allow any principal 
-# ending in /admin  is given full administrative rights.
-# To enable this, uncomment the following line:
-*/admin *

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/modules/hdp-kerberos/templates/kdc.conf
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-kerberos/templates/kdc.conf b/ambari-agent/src/main/puppet/modules/hdp-kerberos/templates/kdc.conf
deleted file mode 100644
index 18f15d5..0000000
--- a/ambari-agent/src/main/puppet/modules/hdp-kerberos/templates/kdc.conf
+++ /dev/null
@@ -1,36 +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.
-
-default_realm = <%= realm %>
-
-[kdcdefaults]
-    v4_mode = nopreauth
-    kdc_ports = 0
-    kdc_tcp_ports = 88 
-
-[realms]
-    <%= realm %> = {
-        acl_file = <%= kdc_etc_path %>/kadm5.acl
-        dict_file = /usr/share/dict/words
-        admin_keytab = <%= kdc_etc_path %>/kadm5.keytab
-        supported_enctypes = des3-hmac-sha1:normal arcfour-hmac:normal des-hmac-sha1:normal des-cbc-md5:normal des-cbc-crc:normal des-cbc-crc:v4 des-cbc-crc:afs3
-        kdc_ports = <%= kdc_port %>
-        database_name = <%= kdc_etc_path %>/principal
-        key_stash_file = <%= kdc_etc_path %>/stash
-        max_life = 10h 0m 0s
-        max_renewable_life = 7d 0h 0m 0s
-        master_key_type = des3-hmac-sha1
-        default_principal_flags = +preauth
-    }

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/modules/hdp-kerberos/templates/krb5.conf
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-kerberos/templates/krb5.conf b/ambari-agent/src/main/puppet/modules/hdp-kerberos/templates/krb5.conf
deleted file mode 100644
index 04ce978..0000000
--- a/ambari-agent/src/main/puppet/modules/hdp-kerberos/templates/krb5.conf
+++ /dev/null
@@ -1,47 +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.
-
-[libdefaults]
-    default_realm = <%= realm %>
-    dns_lookup_realm = false
-    dns_lookup_kdc = false
-    ticket_lifetime = 24h
-    forwardable = yes
-    udp_preference_limit = 1
-
-[realms]
-    <%= realm %> = {
-        kdc = <%= kdc_server %>:<%= kdc_port %>
-        admin_server = <%= kdc_server %>:749
-        default_domain = <%= domain %>
-    }
-
-[appdefaults] 
-    pam = {
-        debug = false 
-        ticket_lifetime = 36000 
-        renew_lifetime = 36000 
-        forwardable = true 
-        krb4_convert = false 
-    }
-
-[domain_realm]
-    .<%= domain %> = <%= realm %>
-     <%= domain %> = <%= realm %>
-
-[logging]
-    default = FILE:/var/log/krb5libs.log
-    kdc = FILE:/var/log/krb5kdc.log
-    admin_server = FILE:/var/log/kadmind.log

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/modules/hdp-kerberos/tests/init.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-kerberos/tests/init.pp b/ambari-agent/src/main/puppet/modules/hdp-kerberos/tests/init.pp
deleted file mode 100644
index fb8434b..0000000
--- a/ambari-agent/src/main/puppet/modules/hdp-kerberos/tests/init.pp
+++ /dev/null
@@ -1,31 +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.
-
-$kerberos_domain = "krb.test.com"
-$kerberos_realm = "KRB.TEST.COM"
-$kerberos_kdc_server = "localhost"
-$kerberos_kdc_port = 88
-# the following turns a node into a fully functional KDC 
-include kerberos::kdc
-# the following opens up KDC principle datbase for remote
-# administration (it really should be optional, but it is
-# required for now in order to make kerberos::client::host_keytab
-# work)
-include kerberos::kdc::admin_server
-
-# the following turns a node into a Kerberos client hosts with.. 
-include kerberos::client
-# ...an optional host_keytab for as many services as you want:
-kerberos::client::host_keytab { ["host", "hdfs", "mapred"]: }

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/modules/hdp-monitor-webserver/manifests/init.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-monitor-webserver/manifests/init.pp b/ambari-agent/src/main/puppet/modules/hdp-monitor-webserver/manifests/init.pp
deleted file mode 100644
index 6c5cc1d..0000000
--- a/ambari-agent/src/main/puppet/modules/hdp-monitor-webserver/manifests/init.pp
+++ /dev/null
@@ -1,123 +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.
-#
-#
-class hdp-monitor-webserver( 
-  $service_state = $hdp::params::cluster_service_state,
-  $opts = {}
-) inherits hdp::params
-{
-
-  
-  if hdp_is_empty($hdp::params::services_names[httpd]) {
-      hdp_fail("There is no service name for service httpd")
-    }
-    else {
-      $service_name_by_os = $hdp::params::services_names[httpd]
-    }
-
-    if hdp_is_empty($service_name_by_os[$hdp::params::hdp_os_type]) {
-      
-      if hdp_is_empty($service_name_by_os['ALL']) {
-        hdp_fail("There is no service name for service httpd")
-      }
-      else {
-        $service_name = $service_name_by_os['ALL']
-      }
-    }
-    else {
-      $service_name = $service_name_by_os[$hdp::params::hdp_os_type]
-    }
-
-    if hdp_is_empty($hdp::params::pathes[httpd_conf_dir]) {
-      hdp_fail("There is no config dir path for service httpd")
-    }
-    else {
-      $path_by_os = $hdp::params::pathes[httpd_conf_dir]
-    }
-
-    if hdp_is_empty($path_by_os[$hdp::params::hdp_os_type]) {
-      
-      if hdp_is_empty($path_by_os['ALL']) {
-        hdp_fail("There is no config dir path for service httpd")
-      }
-      else {
-        $httpd_conf_dir = $path_by_os['ALL']
-      }
-    }
-    else {
-      $httpd_conf_dir = $path_by_os[$hdp::params::hdp_os_type]
-    }
-
-
-  if ($service_state == 'no_op') {
-  } elsif ($service_state in ['running','stopped','installed_and_configured', 'restart']) {
-
-
-    if ($service_state == 'running') {
-      #TODO: refine by using notify/subscribe
-      hdp::exec { 'monitor webserver start':
-        command => "/etc/init.d/$service_name start",
-        unless => "/etc/init.d/$service_name status",
-        require => Hdp::Exec['enabling keepalive for httpd']
-
-      } 
-
-      hdp::package { 'httpd' :
-        size   => 64
-      }
-    hdp::exec {'enabling keepalive for httpd':
-      command     => "grep -E 'KeepAlive (On|Off)' ${httpd_conf_dir}/httpd.conf && sed -i 's/KeepAlive Off/KeepAlive On/' ${httpd_conf_dir}/httpd.conf || echo 'KeepAlive On' >> ${httpd_conf_dir}/httpd.conf",
-      require => Hdp::Package['httpd']
-
-    }
-
-    } elsif ($service_state == 'stopped') {
-      # stop should never fail if process already stopped
-      hdp::exec { 'monitor webserver stop':
-        command => "/etc/init.d/$service_name stop"
-      }
-    } elsif ($service_state == 'restart') {
-      hdp::exec { 'monitor webserver restart':
-        command => "/etc/init.d/$service_name restart",
-        require => Hdp::Exec['enabling keepalive for httpd']
-      }
-      hdp::package { 'httpd' :
-        size   => 64
-      }
-
-    hdp::exec {'enabling keepalive for httpd':
-      command     => "grep -E 'KeepAlive (On|Off)' ${httpd_conf_dir}/httpd.conf && sed -i 's/KeepAlive Off/KeepAlive On/' ${httpd_conf_dir}/httpd.conf || echo 'KeepAlive On' >> ${httpd_conf_dir}/httpd.conf",
-      require => Hdp::Package['httpd']
-    }
-
-    } elsif ($service_state == 'installed_and_configured') {
-      hdp::package { 'httpd' :
-        size   => 64
-      }
-
-    hdp::exec {'enabling keepalive for httpd':
-      command     => "grep -E 'KeepAlive (On|Off)' ${httpd_conf_dir}/httpd.conf && sed -i 's/KeepAlive Off/KeepAlive On/' ${httpd_conf_dir}/httpd.conf || echo 'KeepAlive On' >> ${httpd_conf_dir}/httpd.conf",
-      require => Hdp::Package['httpd']
-    }
-    }
-  } else {
-    hdp_fail("TODO not implemented yet: service_state = ${service_state}")
-  }
-}

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/modules/hdp-mysql/files/addMysqlUser.sh
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-mysql/files/addMysqlUser.sh b/ambari-agent/src/main/puppet/modules/hdp-mysql/files/addMysqlUser.sh
deleted file mode 100644
index 8c12260..0000000
--- a/ambari-agent/src/main/puppet/modules/hdp-mysql/files/addMysqlUser.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-#
-#
-# 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.
-#
-#
-
-mysqldservice=$1
-mysqldbuser=$2
-mysqldbpasswd=$3
-mysqldbhost=$4
-myhostname=$(hostname -f)
-
-service $mysqldservice start
-echo "Adding user $mysqldbuser@$mysqldbhost and $mysqldbuser@localhost"
-mysql -u root -e "CREATE USER '$mysqldbuser'@'$mysqldbhost' IDENTIFIED BY '$mysqldbpasswd';"
-mysql -u root -e "CREATE USER '$mysqldbuser'@'localhost' IDENTIFIED BY '$mysqldbpasswd';"
-mysql -u root -e "GRANT ALL PRIVILEGES ON *.* TO '$mysqldbuser'@'$mysqldbhost';"
-mysql -u root -e "GRANT ALL PRIVILEGES ON *.* TO '$mysqldbuser'@'localhost';"
-if [ '$(mysql -u root -e "select user from mysql.user where user='$mysqldbuser' and host='$myhostname'" | grep "$mysqldbuser")' != '0' ]; then
-  echo "Adding user $mysqldbuser@$myhostname";
-  mysql -u root -e "CREATE USER '$mysqldbuser'@'$myhostname' IDENTIFIED BY '$mysqldbpasswd';";
-  mysql -u root -e "GRANT ALL PRIVILEGES ON *.* TO '$mysqldbuser'@'$myhostname';";
-fi
-mysql -u root -e "flush privileges;"
-service $mysqldservice stop
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/3d1171b0/ambari-agent/src/main/puppet/modules/hdp-mysql/manifests/init.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-mysql/manifests/init.pp b/ambari-agent/src/main/puppet/modules/hdp-mysql/manifests/init.pp
deleted file mode 100644
index 2af7c53..0000000
--- a/ambari-agent/src/main/puppet/modules/hdp-mysql/manifests/init.pp
+++ /dev/null
@@ -1,22 +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.
-#
-#
-class hdp-mysql(){}
-


Mime
View raw message