Repository: bigtop Updated Branches: refs/heads/master 71df9df1f -> cf19b047f
BIGTOP-2585: Zookeeper service does not start if kerberos is disabled Signed-off-by: Evans Ye <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/cf19b047 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/cf19b047 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/cf19b047 Branch: refs/heads/master Commit: cf19b047f02cfdb019e47e881c58db82372cd810 Parents: 71df9df Author: Kengo Seki <[email protected]> Authored: Tue Nov 15 19:40:24 2016 +0900 Committer: Evans Ye <[email protected]> Committed: Thu Nov 17 01:27:52 2016 +0800 ---------------------------------------------------------------------- bigtop-deploy/puppet/modules/hadoop_hbase/manifests/init.pp | 2 +- bigtop-deploy/puppet/modules/hadoop_hive/manifests/init.pp | 2 +- bigtop-deploy/puppet/modules/hadoop_oozie/manifests/init.pp | 2 +- .../puppet/modules/hadoop_zookeeper/manifests/init.pp | 6 +++--- bigtop-deploy/puppet/modules/hue/manifests/init.pp | 2 +- bigtop-deploy/puppet/modules/solr/manifests/init.pp | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/cf19b047/bigtop-deploy/puppet/modules/hadoop_hbase/manifests/init.pp ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/modules/hadoop_hbase/manifests/init.pp b/bigtop-deploy/puppet/modules/hadoop_hbase/manifests/init.pp index fb1de96..f904ab2 100644 --- a/bigtop-deploy/puppet/modules/hadoop_hbase/manifests/init.pp +++ b/bigtop-deploy/puppet/modules/hadoop_hbase/manifests/init.pp @@ -44,7 +44,7 @@ class hadoop_hbase { class common_config ($rootdir, $zookeeper_quorum, $kerberos_realm = "", $heap_size="1024") { include hadoop_hbase::client_package - if ($kerberos_realm) { + if ($kerberos_realm and $kerberos_realm != "") { require kerberos::client kerberos::host_keytab { "hbase": spnego => true, http://git-wip-us.apache.org/repos/asf/bigtop/blob/cf19b047/bigtop-deploy/puppet/modules/hadoop_hive/manifests/init.pp ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/modules/hadoop_hive/manifests/init.pp b/bigtop-deploy/puppet/modules/hadoop_hive/manifests/init.pp index 967bb50..33f494f 100644 --- a/bigtop-deploy/puppet/modules/hadoop_hive/manifests/init.pp +++ b/bigtop-deploy/puppet/modules/hadoop_hive/manifests/init.pp @@ -49,7 +49,7 @@ class hadoop_hive { $server2_thrift_http_port = "10001", $hive_execution_engine = "mr") { include hadoop_hive::client_package - if ($kerberos_realm) { + if ($kerberos_realm and $kerberos_realm != "") { require kerberos::client kerberos::host_keytab { "hive": spnego => true, http://git-wip-us.apache.org/repos/asf/bigtop/blob/cf19b047/bigtop-deploy/puppet/modules/hadoop_oozie/manifests/init.pp ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/modules/hadoop_oozie/manifests/init.pp b/bigtop-deploy/puppet/modules/hadoop_oozie/manifests/init.pp index 7a3c62d..f7ee01d 100644 --- a/bigtop-deploy/puppet/modules/hadoop_oozie/manifests/init.pp +++ b/bigtop-deploy/puppet/modules/hadoop_oozie/manifests/init.pp @@ -37,7 +37,7 @@ class hadoop_oozie { } class server($kerberos_realm = "") { - if ($kerberos_realm) { + if ($kerberos_realm and $kerberos_realm != "") { require kerberos::client kerberos::host_keytab { "oozie": spnego => true, http://git-wip-us.apache.org/repos/asf/bigtop/blob/cf19b047/bigtop-deploy/puppet/modules/hadoop_zookeeper/manifests/init.pp ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/modules/hadoop_zookeeper/manifests/init.pp b/bigtop-deploy/puppet/modules/hadoop_zookeeper/manifests/init.pp index 5d3ee95..7c35d71 100644 --- a/bigtop-deploy/puppet/modules/hadoop_zookeeper/manifests/init.pp +++ b/bigtop-deploy/puppet/modules/hadoop_zookeeper/manifests/init.pp @@ -30,7 +30,7 @@ class hadoop_zookeeper ( class common ( $kerberos_realm = $hadoop_zookeeper::kerberos_realm, ) inherits hadoop_zookeeper { - if ($kerberos_realm) { + if ($kerberos_realm and $kerberos_realm != "") { file { '/etc/zookeeper/conf/java.env': source => 'puppet:///modules/hadoop_zookeeper/java.env', } @@ -50,7 +50,7 @@ class hadoop_zookeeper ( require => Package["jdk"], } - if ($kerberos_realm) { + if ($kerberos_realm and $kerberos_realm != "") { file { '/etc/zookeeper/conf/client-jaas.conf': content => template('hadoop_zookeeper/client-jaas.conf'), require => Package['zookeeper'], @@ -98,7 +98,7 @@ class hadoop_zookeeper ( require => Package["zookeeper-server"], } - if ($kerberos_realm) { + if ($kerberos_realm and $kerberos_realm != "") { require kerberos::client kerberos::host_keytab { "zookeeper": http://git-wip-us.apache.org/repos/asf/bigtop/blob/cf19b047/bigtop-deploy/puppet/modules/hue/manifests/init.pp ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/modules/hue/manifests/init.pp b/bigtop-deploy/puppet/modules/hue/manifests/init.pp index 2b64687..fa189a1 100644 --- a/bigtop-deploy/puppet/modules/hue/manifests/init.pp +++ b/bigtop-deploy/puppet/modules/hue/manifests/init.pp @@ -53,7 +53,7 @@ class hue { default => concat(prefix($hue_apps, "hue-"), [ "hue-server" ]) } - if ($kerberos_realm) { + if ($kerberos_realm and $kerberos_realm != "") { require kerberos::client kerberos::host_keytab { "hue": spnego => false, http://git-wip-us.apache.org/repos/asf/bigtop/blob/cf19b047/bigtop-deploy/puppet/modules/solr/manifests/init.pp ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/modules/solr/manifests/init.pp b/bigtop-deploy/puppet/modules/solr/manifests/init.pp index c90e0e7..99a8f3b 100644 --- a/bigtop-deploy/puppet/modules/solr/manifests/init.pp +++ b/bigtop-deploy/puppet/modules/solr/manifests/init.pp @@ -46,7 +46,7 @@ class solr { hasstatus => true, } - if ($kerberos_realm) { + if ($kerberos_realm and $kerberos_realm != "") { require kerberos::client kerberos::host_keytab { "solr":
