diff options
| author | Cos <cos@apache.org> | 2016-01-23 15:28:04 -0800 |
|---|---|---|
| committer | Cos <cos@apache.org> | 2016-01-23 15:28:04 -0800 |
| commit | 6c774fa8de76a1f205ff3e2f9f3ed9ac0734301f (patch) | |
| tree | 54e2158f5afeb3b44099effd027a43b4641ce472 /bigtop-deploy/puppet | |
| parent | 0785780af0bf4bb999ddc1eded5fabb822c0221d (diff) | |
| parent | a05aab178348118c5fecc4329ae97c449598b1c8 (diff) | |
Merge pull request #19 from odpi/master
Routine synchronization w/ upstream
Staying up-to-date with needed changes from the upstream master
Diffstat (limited to 'bigtop-deploy/puppet')
| -rw-r--r-- | bigtop-deploy/puppet/modules/spark/manifests/init.pp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/bigtop-deploy/puppet/modules/spark/manifests/init.pp b/bigtop-deploy/puppet/modules/spark/manifests/init.pp index b93be1d0..ee42821c 100644 --- a/bigtop-deploy/puppet/modules/spark/manifests/init.pp +++ b/bigtop-deploy/puppet/modules/spark/manifests/init.pp @@ -148,6 +148,13 @@ class spark { package { 'spark-core': ensure => latest, } +### This is an ungodly hack to deal with the consequence of adding +### unconditional hive-support into Spark +### The addition is tracked by BIGTOP-2154 +### The real fix will come in BIGTOP-2268 + package { 'spark-datanucleus': + ensure => latest, + } file { '/etc/spark/conf/spark-env.sh': content => template('spark/spark-env.sh'), |