Updated Branches: refs/heads/trunk 43198bf60 -> 012354b75
AMBARI-2995: zooKeeper quorum check fails in secure cluster. (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/012354b7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/012354b7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/012354b7 Branch: refs/heads/trunk Commit: 012354b7515df9cde15096f0e82a34f9719902a2 Parents: 43198bf Author: Jaimin Jetly <[email protected]> Authored: Thu Aug 22 14:05:17 2013 -0700 Committer: Jaimin Jetly <[email protected]> Committed: Thu Aug 22 15:34:06 2013 -0700 ---------------------------------------------------------------------- .../modules/hdp-zookeeper/manifests/quorum/service_check.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/012354b7/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/quorum/service_check.pp ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/quorum/service_check.pp b/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/quorum/service_check.pp index 2a14661..159f225 100644 --- a/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/quorum/service_check.pp +++ b/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/quorum/service_check.pp @@ -43,7 +43,7 @@ define hdp-zookeeper::quorum_smoke_shell_file() $smoke_script = $hdp::params::zk_smoke_test_script $smoke_user_keytab = $hdp::params::smokeuser_keytab $kinit_path = $hdp::params::kinit_path_local - + $security_enabled = $hdp::params::security_enabled file { '/tmp/zkSmoke.sh': ensure => present, source => "puppet:///modules/hdp-zookeeper/zkSmoke.sh", @@ -51,7 +51,7 @@ define hdp-zookeeper::quorum_smoke_shell_file() } exec { '/tmp/zkSmoke.sh': - command => "sh /tmp/zkSmoke.sh ${smoke_script} ${smoke_test_user} ${conf_dir} ${::clientPort} ${::security_enabled} ${kinit_path} ${smoke_user_keytab}", + command => "sh /tmp/zkSmoke.sh ${smoke_script} ${smoke_test_user} ${conf_dir} ${::clientPort} ${security_enabled} ${kinit_path} ${smoke_user_keytab}", tries => 3, try_sleep => 5, require => File['/tmp/zkSmoke.sh'],
