Updated Branches: refs/heads/trunk da8d55e0b -> 7c3bab94d
AMBARI-2876. Puppet script syntax issues result in hive deployment with custom DB and oozie service check failures. (smohanty) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/7c3bab94 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/7c3bab94 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/7c3bab94 Branch: refs/heads/trunk Commit: 7c3bab94dc189df03eabc2ef14cda11c5738c48b Parents: da8d55e Author: Sumit Mohanty <[email protected]> Authored: Mon Aug 12 14:26:19 2013 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Mon Aug 12 14:26:19 2013 -0700 ---------------------------------------------------------------------- .../main/puppet/modules/hdp-hive/manifests/jdbc-connector.pp | 6 ++++++ .../puppet/modules/hdp-oozie/manifests/oozie/service_check.pp | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/7c3bab94/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/jdbc-connector.pp ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/jdbc-connector.pp b/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/jdbc-connector.pp index 4b01998..8bd9302 100644 --- a/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/jdbc-connector.pp +++ b/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/jdbc-connector.pp @@ -24,9 +24,15 @@ class hdp-hive::jdbc-connector() $jdbc_jar_name = $hdp-hive::params::jdbc_jar_name + $java_share_dir = "/usr/share/java" + $driver_curl_target = "${java_share_dir}/${jdbc_jar_name}" + $hive_lib = $hdp-hive::params::hive_lib $target = "${hive_lib}/${jdbc_jar_name}" + $jdk_location = $hdp::params::jdk_location + $driver_curl_source = "${jdk_location}${jdbc_jar_name}" + anchor { 'hdp-hive::jdbc-connector::begin':} hdp::package { 'mysql-connector-java' : http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/7c3bab94/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/oozie/service_check.pp ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/oozie/service_check.pp b/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/oozie/service_check.pp index d5344e1..518c16d 100644 --- a/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/oozie/service_check.pp +++ b/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/oozie/service_check.pp @@ -47,6 +47,8 @@ define hdp-oozie::smoke_shell_file( $conf_dir = $hdp::params::oozie_conf_dir $hadoopconf_dir = $hdp::params::hadoop_conf_dir $security_enabled=$hdp::params::security_enabled + $jt_host=$hdp::params::jtnode_host + $nn_host=$hdp::params::namenode_host if ($security_enabled == true) { $security = "true" } else { @@ -54,9 +56,6 @@ define hdp-oozie::smoke_shell_file( } $smoke_user_keytab = $hdp::params::smokeuser_keytab $realm=$hdp::params::kerberos_domain - $kinit_path = $hdp::params::kinit_path_local - $nn_principal = $hdp::params::nn_principal - $jt_principal = $hdp::params::jt_principal file { "/tmp/${smoke_shell_file_name}": ensure => present,
