Przeglądaj źródła

AMBARI-2581. oozieSmoke test not settting kinit path correctly. (swagle)

Siddharth Wagle 12 lat temu
rodzic
commit
12575e7873

+ 1 - 0
ambari-agent/src/main/puppet/modules/hdp-oozie/files/oozieSmoke.sh

@@ -61,6 +61,7 @@ export smoke_user_keytab=$5
 export realm=$6
 export JTHOST=$7
 export NNHOST=$8
+export kinit_path_local=$9
 
 export OOZIE_EXIT_CODE=0
 export JOBTRACKER=`getValueFromField ${hadoop_conf_dir}/mapred-site.xml mapred.job.tracker`

+ 2 - 1
ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/oozie/service_check.pp

@@ -45,6 +45,7 @@ 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
 
   file { '/tmp/oozieSmoke.sh':
     ensure => present,
@@ -53,7 +54,7 @@ define hdp-oozie::smoke_shell_file()
   }
 
   exec { '/tmp/oozieSmoke.sh':
-    command   => "sh /tmp/oozieSmoke.sh ${conf_dir} ${hadoopconf_dir} ${smoke_test_user} ${security} ${smoke_user_keytab} ${realm} $jt_host $nn_host",
+    command   => "sh /tmp/oozieSmoke.sh ${conf_dir} ${hadoopconf_dir} ${smoke_test_user} ${security} ${smoke_user_keytab} ${realm} $jt_host $nn_host $kinit_path",
     tries     => 3,
     try_sleep => 5,
     require   => File['/tmp/oozieSmoke.sh'],