|
21 | 21 | # [*package*]
|
22 | 22 | # Name of the package to install (when install='package'). If not default it's
|
23 | 23 | # automatically defined for the operatingsystem
|
24 |
| -# Default: '' |
| 24 | +# Default: undef |
25 | 25 | #
|
26 | 26 | # [*package_source*]
|
27 | 27 | # Source from where to retrieve the defined package. Use a url.
|
|
44 | 44 | $version = '7',
|
45 | 45 | $headless = true,
|
46 | 46 | $install = 'package',
|
47 |
| - $install_source = '', |
48 |
| - $package = '', |
| 47 | + $install_source = undef, |
| 48 | + $package = undef, |
49 | 49 | $package_source = undef,
|
50 | 50 | $package_responsefile = undef,
|
51 | 51 | $package_provider = undef,
|
|
59 | 59 | case $install {
|
60 | 60 |
|
61 | 61 | 'package': {
|
62 |
| - |
63 | 62 | $headless_suffix = $bool_headless ? {
|
64 | 63 | true => '-headless',
|
65 | 64 | default => '',
|
66 | 65 | }
|
67 | 66 | $real_package = $package ? {
|
68 |
| - '' => $bool_jdk ? { |
| 67 | + undef => $bool_jdk ? { |
69 | 68 | false => $::operatingsystem ? {
|
70 | 69 | /(?i:RedHat|Centos|Fedora|Scientific|Amazon|Linux)/ => "java-1.${version}.0-openjdk",
|
71 | 70 | /(?i:Ubuntu|Debian|Mint)/ => "openjdk-${version}-jre${headless_suffix}",
|
|
78 | 77 | },
|
79 | 78 | default => fail("OperatingSystem ${::operatingsystem} not supported"),
|
80 | 79 | },
|
81 |
| - true => $::operatingsystem ? { |
| 80 | + true => $::operatingsystem ? { |
82 | 81 | /(?i:RedHat|Centos|Fedora|Scientific|Amazon|Linux)/ => "java-1.${version}.0-openjdk-devel",
|
83 | 82 | /(?i:Ubuntu|Debian|Mint)/ => "openjdk-${version}-jdk",
|
84 | 83 | /(?i:SLES)/ => "java-1_${version}_0-ibm",
|
|
88 | 87 | '11' => "jdk-${version}",
|
89 | 88 | '5' => 'jdk',
|
90 | 89 | },
|
91 |
| - default => fail("OperatingSystem ${::operatingsystem} not supported"), |
| 90 | + default => fail("OperatingSystem ${::operatingsystem} not supported"), |
92 | 91 | }
|
93 | 92 | },
|
94 | 93 | default => $package,
|
|
105 | 104 | responsefile => $package_responsefile,
|
106 | 105 | provider => $package_provider,
|
107 | 106 | }
|
108 |
| - |
109 | 107 | }
|
110 |
| - |
111 | 108 | 'source': {
|
112 | 109 | if (!$install_source) {
|
113 | 110 | fail('Required arguement: install_source')
|
|
130 | 127 | target => $created_dir,
|
131 | 128 | require => Puppi::Netinstall["netinstall_java_${name}"],
|
132 | 129 | }
|
133 |
| - |
134 | 130 | }
|
135 |
| - |
136 |
| - default: { } |
137 |
| - |
| 131 | + default: { |
| 132 | + fail("java::install::${name}::install is <${install}> and must be 'package' or 'source'.") |
| 133 | + } |
138 | 134 | }
|
139 | 135 | }
|
0 commit comments