Skip to content

Commit 5db6faf

Browse files
committed
Removed empty default hash for hiera_hash functions
1 parent 9802850 commit 5db6faf

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

manifests/init.pp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
if $crons != undef {
7676
if $crons_hiera_merge_real == true {
7777
if versioncmp($::puppetversion, '4.0.0') < 0 {
78-
$crons_real = hiera_hash('types::crons', {})
78+
$crons_real = hiera_hash('types::crons')
7979
} else {
8080
$crons_real = lookup('types::crons', Hash, 'deep', {})
8181
}
@@ -89,7 +89,7 @@
8989
if $execs != undef {
9090
if $execs_hiera_merge_bool == true {
9191
if versioncmp($::puppetversion, '4.0.0') < 0 {
92-
$execs_real = hiera_hash('types::execs', {})
92+
$execs_real = hiera_hash('types::execs')
9393
} else {
9494
$execs_real = lookup('types::execs', Hash, 'deep', {})
9595
}
@@ -103,7 +103,7 @@
103103
if $file_lines != undef {
104104
if $file_lines_hiera_merge_real == true {
105105
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')
107107
} else {
108108
$file_lines_real = lookup('types::file_lines', Hash, 'deep', {})
109109
}
@@ -117,7 +117,7 @@
117117
if $files != undef {
118118
if $files_hiera_merge_real == true {
119119
if versioncmp($::puppetversion, '4.0.0') < 0 {
120-
$files_real = hiera_hash('types::files', {})
120+
$files_real = hiera_hash('types::files')
121121
} else {
122122
$files_real = lookup('types::files', Hash, 'deep', {})
123123
}
@@ -131,7 +131,7 @@
131131
if $mounts != undef {
132132
if $mounts_hiera_merge_real == true {
133133
if versioncmp($::puppetversion, '4.0.0') < 0 {
134-
$mounts_real = hiera_hash('types::mounts', {})
134+
$mounts_real = hiera_hash('types::mounts')
135135
} else {
136136
$mounts_real = lookup('types::mounts', Hash, 'deep', {})
137137
}
@@ -145,7 +145,7 @@
145145
if $packages != undef {
146146
if $packages_hiera_merge_real == true {
147147
if versioncmp($::puppetversion, '4.0.0') < 0 {
148-
$packages_real = hiera_hash('types::packages', {})
148+
$packages_real = hiera_hash('types::packages')
149149
} else {
150150
$packages_real = lookup('types::packages', Hash, 'deep', {})
151151
}
@@ -159,7 +159,7 @@
159159
if $selbooleans != undef {
160160
if $selbooleans_hiera_merge_real == true {
161161
if versioncmp($::puppetversion, '4.0.0') < 0 {
162-
$selbooleans_real = hiera_hash('types::selboolean', {})
162+
$selbooleans_real = hiera_hash('types::selboolean')
163163
} else {
164164
$selbooleans_real = lookup('types::selboolean', Hash, 'deep', {})
165165
}
@@ -173,7 +173,7 @@
173173
if $services != undef {
174174
if $services_hiera_merge_real == true {
175175
if versioncmp($::puppetversion, '4.0.0') < 0 {
176-
$services_real = hiera_hash('types::services', {})
176+
$services_real = hiera_hash('types::services')
177177
} else {
178178
$services_real = lookup('types::services', Hash, 'deep', {})
179179
}

0 commit comments

Comments
 (0)