You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by co...@apache.org on 2015/04/28 19:32:30 UTC
bigtop git commit: BIGTOP-1849. toolchain can not set java home
correctly in CentOS 7
Repository: bigtop
Updated Branches:
refs/heads/master 4a10e473d -> 05abe61cb
BIGTOP-1849. toolchain can not set java home correctly in CentOS 7
Signed-off-by: Konstantin Boudnik <co...@wandisco.com>
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/05abe61c
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/05abe61c
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/05abe61c
Branch: refs/heads/master
Commit: 05abe61cb1a44488b58c82bf898aea43d570bcbb
Parents: 4a10e47
Author: Evans Ye <ev...@apache.org>
Authored: Mon Apr 27 04:15:01 2015 +0000
Committer: Konstantin Boudnik <co...@wandisco.com>
Committed: Tue Apr 28 10:32:22 2015 -0700
----------------------------------------------------------------------
bigtop_toolchain/manifests/env.pp | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/05abe61c/bigtop_toolchain/manifests/env.pp
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/manifests/env.pp b/bigtop_toolchain/manifests/env.pp
index e16c7b5..023d6ad 100644
--- a/bigtop_toolchain/manifests/env.pp
+++ b/bigtop_toolchain/manifests/env.pp
@@ -33,6 +33,25 @@ class bigtop_toolchain::env {
mode => 644,
}
}
+ CentOS: {
+ if $operatingsystemmajrelease >=7 {
+ file {'/etc/profile.d/bigtop.sh':
+ source => 'puppet:///modules/bigtop_toolchain/jenkins.sh.fedora',
+ ensure => present,
+ owner => root,
+ group => root,
+ mode => 644,
+ }
+ } else {
+ file {'/etc/profile.d/bigtop.sh':
+ source => 'puppet:///modules/bigtop_toolchain/jenkins.sh.centos',
+ ensure => present,
+ owner => root,
+ group => root,
+ mode => 644,
+ }
+ }
+ }
default: {
file {'/etc/profile.d/bigtop.sh':
source => 'puppet:///modules/bigtop_toolchain/jenkins.sh.centos',