[bigtop] branch branch-1.5 updated: BIGTOP-3462. Deploying Livy fails if the SPARK_HOME directory doesn't exist. (#709)

[se...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sekikn pushed a commit to branch branch-1.5
in repository https://gitbox.apache.org/repos/asf/bigtop.git


The following commit(s) were added to refs/heads/branch-1.5 by this push:
     new 82d8777  BIGTOP-3462. Deploying Livy fails if the SPARK_HOME directory doesn't exist. (#709)
82d8777 is described below

commit 82d8777c2701ad7bd9b44dffbc0241884da6691c
Author: Kengo Seki <se...@apache.org>
AuthorDate: Sun Dec 6 09:59:20 2020 +0900

    BIGTOP-3462. Deploying Livy fails if the SPARK_HOME directory doesn't exist. (#709)
    
    
    (cherry picked from commit 77d41573bb4d8c41e5f4b606c905698dcc49ee81)
---
 bigtop-deploy/puppet/modules/livy/manifests/init.pp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/bigtop-deploy/puppet/modules/livy/manifests/init.pp b/bigtop-deploy/puppet/modules/livy/manifests/init.pp
index c832ef4..51de7ce 100644
--- a/bigtop-deploy/puppet/modules/livy/manifests/init.pp
+++ b/bigtop-deploy/puppet/modules/livy/manifests/init.pp
@@ -15,6 +15,7 @@ class livy {
   class deploy ($roles) {
     if ('livy-server' in $roles) {
       include livy::server
+      include spark::common
     }
   }
 
@@ -43,10 +44,13 @@ class livy {
 
     service { 'livy-server':
       ensure     => running,
-      require    => Package['livy'],
+      require    => [
+        Package['spark-core'],
+        Package['livy'],
+      ],
       hasrestart => true,
       hasstatus  => true,
-      subscribe => [
+      subscribe  => [
         File['/etc/livy/conf/livy-env.sh'],
         File['/etc/livy/conf/livy.conf']
       ]