diff options
Diffstat (limited to 'bigtop_toolchain/manifests')
-rw-r--r-- | bigtop_toolchain/manifests/env.pp | 71 | ||||
-rw-r--r-- | bigtop_toolchain/manifests/jdk.pp | 2 |
2 files changed, 19 insertions, 54 deletions
diff --git a/bigtop_toolchain/manifests/env.pp b/bigtop_toolchain/manifests/env.pp index 738cd965..b309eca8 100644 --- a/bigtop_toolchain/manifests/env.pp +++ b/bigtop_toolchain/manifests/env.pp @@ -14,62 +14,27 @@ # limitations under the License. class bigtop_toolchain::env { - case $operatingsystem{ - Ubuntu,Debian: { - file { '/etc/profile.d/bigtop.sh': - source => 'puppet:///modules/bigtop_toolchain/jenkins.sh.debian', - ensure => present, - owner => root, - group => root, - mode => 644, - } - } - Fedora: { - file {'/etc/profile.d/bigtop.sh': - source => 'puppet:///modules/bigtop_toolchain/jenkins.sh.fedora', - ensure => present, - owner => root, - group => root, - 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, - } - } + case $architecture { + 'amd64' : { $arch= "amd64" } + 'ppc64le' : { $arch= "ppc64el" } + } + case $operatingsystem { + 'Ubuntu','Debian': { + $javahome = "/usr/lib/jvm/java-1.7.0-openjdk-$arch" } - OpenSuSE: { - file {'/etc/profile.d/bigtop.sh': - source => 'puppet:///modules/bigtop_toolchain/jenkins.sh.opensuse', - ensure => present, - owner => root, - group => root, - mode => 644, - } + 'Fedora','Centos', 'Amazon': { + $javahome = "/usr/lib/jvm/java-1.7.0" } - default: { - file {'/etc/profile.d/bigtop.sh': - source => 'puppet:///modules/bigtop_toolchain/jenkins.sh.centos', - ensure => present, - owner => root, - group => root, - mode => 644, - } + 'OpenSuSE' : { + $javahome = "/usr/lib64/jvm/java-1.7.0-openjdk-1.7.0" } } + file { '/etc/profile.d/bigtop.sh': + content => template('bigtop_toolchain/jenkins.sh'), + ensure => present, + owner => root, + group => root, + mode => 644, + } } diff --git a/bigtop_toolchain/manifests/jdk.pp b/bigtop_toolchain/manifests/jdk.pp index 6c71ec42..730728f9 100644 --- a/bigtop_toolchain/manifests/jdk.pp +++ b/bigtop_toolchain/manifests/jdk.pp @@ -47,7 +47,7 @@ class bigtop_toolchain::jdk { Apt::Ppa['http://ppa.launchpad.net/openjdk-r/ppa/ubuntu'] -> Exec['apt-update'] } - /(CentOS|Fedora|Amazon|OpenSuSE)/: { + /(CentOS|Fedora|Amazon)/: { package { 'java-1.7.0-openjdk-devel' : ensure => present } |