diff --git a/manifests/params.pp b/manifests/params.pp index 865ebd0..f9af13f 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -119,6 +119,19 @@ class java::params { $jre_package = 'java-1_6_0-ibm' } + "SLES": { + case $::operatingsystemmajrelease{ + default: { + $jdk_package = 'java-1_6_0-ibm-devel' + $jre_package = 'java-1_6_0-ibm' + } + '12': { + $jdk_package = 'java-1_7_0-openjdk-devel' + $jre_package = 'java-1_7_0-openjdk' + } + } + } + 'OpenSuSE': { $jdk_package = 'java-1_7_0-openjdk-devel' $jre_package = 'java-1_7_0-openjdk' diff --git a/metadata.json b/metadata.json index 81fa0b5..b5abb13 100644 --- a/metadata.json +++ b/metadata.json @@ -56,7 +56,8 @@ { "operatingsystem": "SLES", "operatingsystemrelease": [ - "11 SP1" + "11 SP1", + "12" ] }, { diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index 37ad8ee..4e460b6 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -18,9 +18,22 @@ unless ENV["RS_PROVISION"] == "no" or ENV["BEAKER_provision"] == "no" on host, "/bin/echo '' > #{host["hieraconf"]}" end on host, "mkdir -p #{host["distmoduledir"]}" - on host, "puppet module install puppetlabs-stdlib", :acceptable_exit_codes => [0,1] - # For test support - on host, "puppet module install puppetlabs-apt", :acceptable_exit_codes => [0,1] + if host['platform'] =~ /sles-1/i || host['platform'] =~ /solaris-1/i + get_stdlib = <<-stdlib + package{'wget':} + exec{'download': + command => "wget -P /root/ https://forgeapi.puppetlabs.com/v3/files/puppetlabs-stdlib-4.3.2.tar.gz --no-check-certificate", + path => ['/opt/csw/bin/','/usr/bin/'] + } + stdlib + apply_manifest_on(host, get_stdlib) + # have to use force otherwise it checks ssl cert even though it is a local file + on host, puppet('module install /root/puppetlabs-stdlib-4.3.2.tar.gz --force') + else + on host, puppet("module install puppetlabs-stdlib") + # For test support + on host, puppet("module install puppetlabs-apt") + end end end