RickRongen/puppetlabs-java
1
0
Fork 0
Code Releases Activity

Merge branch 'comment/master/jre_vs_jdk'

Browse Source 
* comment/master/jre_vs_jdk:
  Change jre and jdk booleans to a single string
This commit is contained in:
Jeff McCune
2011-05-26 11:31:23 -07:00
parent 292503aaf1 867f8c524a
commit b3eb1642ae
1 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
manifests/init.pp
View File

@@ -12,34 +12,32 @@
# #
# [Remember: No empty lines between comments and class definition] # [Remember: No empty lines between comments and class definition]
class java( class java(
$jre = false, $distribution = 'jdk',
$jdk = true, $version = 'installed'
$version='1.6.0_25-fcs'
) { ) {
# Cannot pass anonymous arrays to functions in 2.6.8 # Cannot pass anonymous arrays to functions in 2.6.8
$v_true_false = [ '^true$', '^false$' ] $v_distribution = [ '^jre$', '^jdk$' ]
# Must compare string values, not booleans. # Must compare string values, not booleans.
validate_re("$jre", $v_true_false)
validate_re("$jdk", $v_true_false)
validate_re($version, '^[._0-9a-zA-Z:-]+$') validate_re($version, '^[._0-9a-zA-Z:-]+$')
validate_re($distribution, $v_distribution)
$jre_real = $jre
$jdk_real = $jdk
$version_real = $version $version_real = $version
$distribution_real = $distribution
if $jre_real { case $distribution_real {
jre: {
class { 'java::jre_package': class { 'java::jre_package':
version => $version_real, version => $version_real,
stage => 'runtime', stage => 'runtime',
} }
} }
jdk: {
if $jdk_real {
class { 'java::jdk_package': class { 'java::jdk_package':
version => $version_real, version => $version_real,
stage => 'runtime', stage => 'runtime',
} }
} }
}
} }