Updated Branches: refs/heads/trunk 3e318f904 -> 205bd5695
AMBARI-3058: Enable Security wizard: oozie smoke test fails with HDP-1.x stack. (jaimin) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/205bd569 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/205bd569 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/205bd569 Branch: refs/heads/trunk Commit: 205bd5695ac850fb98640f27d156cfb668e1a105 Parents: 3e318f9 Author: Jaimin Jetly <[email protected]> Authored: Fri Sep 6 17:20:13 2013 -0700 Committer: Jaimin Jetly <[email protected]> Committed: Fri Sep 6 17:20:19 2013 -0700 ---------------------------------------------------------------------- .../src/main/puppet/modules/hdp-oozie/files/oozieSmoke.sh | 7 +------ .../src/main/puppet/modules/hdp-oozie/files/oozieSmoke2.sh | 6 +----- .../puppet/modules/hdp-oozie/manifests/oozie/service_check.pp | 5 ++--- 3 files changed, 4 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/205bd569/ambari-agent/src/main/puppet/modules/hdp-oozie/files/oozieSmoke.sh ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-oozie/files/oozieSmoke.sh b/ambari-agent/src/main/puppet/modules/hdp-oozie/files/oozieSmoke.sh index bc7a464..2446544 100644 --- a/ambari-agent/src/main/puppet/modules/hdp-oozie/files/oozieSmoke.sh +++ b/ambari-agent/src/main/puppet/modules/hdp-oozie/files/oozieSmoke.sh @@ -58,10 +58,7 @@ export hadoop_conf_dir=$2 export smoke_test_user=$3 export security_enabled=$4 export smoke_user_keytab=$5 -export realm=$6 -export JTPRINC=$7 -export NNPRINC=$8 -export kinit_path_local=$9 +export kinit_path_local=$6 export OOZIE_EXIT_CODE=0 export JOBTRACKER=`getValueFromField ${hadoop_conf_dir}/mapred-site.xml mapred.job.tracker` @@ -79,8 +76,6 @@ sed -i "s|oozie.wf.application.path=hdfs://localhost:9000|oozie.wf.application.p if [[ $security_enabled == "true" ]]; then kinitcmd="${kinit_path_local} -kt ${smoke_user_keytab} ${smoke_test_user}; " - echo "dfs.namenode.kerberos.principal=${NNPRINC}" >> examples/apps/map-reduce/job.properties - echo "mapreduce.jobtracker.kerberos.principal=${JTPRINC}" >> examples/apps/map-reduce/job.properties else kinitcmd="" fi http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/205bd569/ambari-agent/src/main/puppet/modules/hdp-oozie/files/oozieSmoke2.sh ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-oozie/files/oozieSmoke2.sh b/ambari-agent/src/main/puppet/modules/hdp-oozie/files/oozieSmoke2.sh index f27d20f..2cb5a7a 100644 --- a/ambari-agent/src/main/puppet/modules/hdp-oozie/files/oozieSmoke2.sh +++ b/ambari-agent/src/main/puppet/modules/hdp-oozie/files/oozieSmoke2.sh @@ -58,9 +58,7 @@ export hadoop_conf_dir=$2 export smoke_test_user=$3 export security_enabled=$4 export smoke_user_keytab=$5 -export realm=$6 -export JTHOST=$7 -export NNHOST=$8 +export kinit_path_local=$6 export OOZIE_EXIT_CODE=0 export JOBTRACKER=`getValueFromField ${hadoop_conf_dir}/yarn-site.xml yarn.resourcemanager.address` @@ -79,8 +77,6 @@ sed -i "s|oozie.wf.application.path=hdfs://localhost:9000|oozie.wf.application.p if [[ $security_enabled == "true" ]]; then kinitcmd="${kinit_path_local} -kt ${smoke_user_keytab} ${smoke_test_user}; " - echo "dfs.namenode.kerberos.principal=nn/`echo ${NNHOST} | tr '[:upper:]' '[:lower:]'`@${realm}" >> examples/apps/map-reduce/job.properties - echo "mapreduce.jobtracker.kerberos.principal=jt/`echo ${JTHOST} | tr '[:upper:]' '[:lower:]'`@${realm}" >> examples/apps/map-reduce/job.properties else kinitcmd="" fi http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/205bd569/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 518c16d..83911e3 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,8 +47,7 @@ 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 + $kinit_path_local = $hdp::params::kinit_path_local if ($security_enabled == true) { $security = "true" } else { @@ -64,7 +63,7 @@ define hdp-oozie::smoke_shell_file( } exec { "/tmp/${smoke_shell_file_name}": - command => "sh /tmp/${smoke_shell_file_name} ${conf_dir} ${hadoopconf_dir} ${smoke_test_user} ${security} ${smoke_user_keytab} ${realm} $jt_host $nn_host", + command => "sh /tmp/${smoke_shell_file_name} ${conf_dir} ${hadoopconf_dir} ${smoke_test_user} ${security} ${smoke_user_keytab} ${kinit_path_local}", tries => 3, try_sleep => 5, require => File["/tmp/${smoke_shell_file_name}"],
