Update defaults for SLES
Fixed test issues with solaris-11 and added support for sles-12
This commit is contained in:
@@ -119,6 +119,19 @@ class java::params {
|
|||||||
$jre_package = 'java-1_6_0-ibm'
|
$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': {
|
'OpenSuSE': {
|
||||||
$jdk_package = 'java-1_7_0-openjdk-devel'
|
$jdk_package = 'java-1_7_0-openjdk-devel'
|
||||||
$jre_package = 'java-1_7_0-openjdk'
|
$jre_package = 'java-1_7_0-openjdk'
|
||||||
|
|||||||
@@ -56,7 +56,8 @@
|
|||||||
{
|
{
|
||||||
"operatingsystem": "SLES",
|
"operatingsystem": "SLES",
|
||||||
"operatingsystemrelease": [
|
"operatingsystemrelease": [
|
||||||
"11 SP1"
|
"11 SP1",
|
||||||
|
"12"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -18,9 +18,22 @@ unless ENV["RS_PROVISION"] == "no" or ENV["BEAKER_provision"] == "no"
|
|||||||
on host, "/bin/echo '' > #{host["hieraconf"]}"
|
on host, "/bin/echo '' > #{host["hieraconf"]}"
|
||||||
end
|
end
|
||||||
on host, "mkdir -p #{host["distmoduledir"]}"
|
on host, "mkdir -p #{host["distmoduledir"]}"
|
||||||
on host, "puppet module install puppetlabs-stdlib", :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
|
# For test support
|
||||||
on host, "puppet module install puppetlabs-apt", :acceptable_exit_codes => [0,1]
|
on host, puppet("module install puppetlabs-apt")
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user