|
75 | 75 | if $crons != undef { |
76 | 76 | if $crons_hiera_merge_real == true { |
77 | 77 | if versioncmp($::puppetversion, '4.0.0') < 0 { |
78 | | - $crons_real = hiera_hash('types::crons', {}) |
| 78 | + $crons_real = hiera_hash('types::crons') |
79 | 79 | } else { |
80 | 80 | $crons_real = lookup('types::crons', Hash, 'deep', {}) |
81 | 81 | } |
|
89 | 89 | if $execs != undef { |
90 | 90 | if $execs_hiera_merge_bool == true { |
91 | 91 | if versioncmp($::puppetversion, '4.0.0') < 0 { |
92 | | - $execs_real = hiera_hash('types::execs', {}) |
| 92 | + $execs_real = hiera_hash('types::execs') |
93 | 93 | } else { |
94 | 94 | $execs_real = lookup('types::execs', Hash, 'deep', {}) |
95 | 95 | } |
|
103 | 103 | if $file_lines != undef { |
104 | 104 | if $file_lines_hiera_merge_real == true { |
105 | 105 | if versioncmp($::puppetversion, '4.0.0') < 0 { |
106 | | - $file_lines_real = hiera_hash('types::file_lines', {}) |
| 106 | + $file_lines_real = hiera_hash('types::file_lines') |
107 | 107 | } else { |
108 | 108 | $file_lines_real = lookup('types::file_lines', Hash, 'deep', {}) |
109 | 109 | } |
|
117 | 117 | if $files != undef { |
118 | 118 | if $files_hiera_merge_real == true { |
119 | 119 | if versioncmp($::puppetversion, '4.0.0') < 0 { |
120 | | - $files_real = hiera_hash('types::files', {}) |
| 120 | + $files_real = hiera_hash('types::files') |
121 | 121 | } else { |
122 | 122 | $files_real = lookup('types::files', Hash, 'deep', {}) |
123 | 123 | } |
|
131 | 131 | if $mounts != undef { |
132 | 132 | if $mounts_hiera_merge_real == true { |
133 | 133 | if versioncmp($::puppetversion, '4.0.0') < 0 { |
134 | | - $mounts_real = hiera_hash('types::mounts', {}) |
| 134 | + $mounts_real = hiera_hash('types::mounts') |
135 | 135 | } else { |
136 | 136 | $mounts_real = lookup('types::mounts', Hash, 'deep', {}) |
137 | 137 | } |
|
145 | 145 | if $packages != undef { |
146 | 146 | if $packages_hiera_merge_real == true { |
147 | 147 | if versioncmp($::puppetversion, '4.0.0') < 0 { |
148 | | - $packages_real = hiera_hash('types::packages', {}) |
| 148 | + $packages_real = hiera_hash('types::packages') |
149 | 149 | } else { |
150 | 150 | $packages_real = lookup('types::packages', Hash, 'deep', {}) |
151 | 151 | } |
|
159 | 159 | if $selbooleans != undef { |
160 | 160 | if $selbooleans_hiera_merge_real == true { |
161 | 161 | if versioncmp($::puppetversion, '4.0.0') < 0 { |
162 | | - $selbooleans_real = hiera_hash('types::selboolean', {}) |
| 162 | + $selbooleans_real = hiera_hash('types::selboolean') |
163 | 163 | } else { |
164 | 164 | $selbooleans_real = lookup('types::selboolean', Hash, 'deep', {}) |
165 | 165 | } |
|
173 | 173 | if $services != undef { |
174 | 174 | if $services_hiera_merge_real == true { |
175 | 175 | if versioncmp($::puppetversion, '4.0.0') < 0 { |
176 | | - $services_real = hiera_hash('types::services', {}) |
| 176 | + $services_real = hiera_hash('types::services') |
177 | 177 | } else { |
178 | 178 | $services_real = lookup('types::services', Hash, 'deep', {}) |
179 | 179 | } |
|
0 commit comments