Skip to content

Commit 9f1650f

Browse files
committed
Fix has_key
1 parent 9dd4a05 commit 9f1650f

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

manifests/fileconf.pp

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@
33
Hash $options = {},
44
Hash $override = {},
55
) {
6-
if has_key($options, $filename) {
7-
$_options = stdlib::merge($options[$filename], $override)
6+
if $filename in $options {
7+
$_options = merge($options[$filename], $override)
88
} else {
9-
$_options = stdlib::merge($options, $override)
9+
$_options = merge($options, $override)
1010
}
1111

12-
$_keys = keys($_options)
13-
$_vals = values($_options)
14-
#validate_array($_keys, $_vals)
12+
$_keys = $_options.keys
13+
$_vals = $_options.values
1514

1615
exec { "opensm-create-${filename}":
1716
command => "/usr/sbin/opensm -c ${filename}",
@@ -25,9 +24,7 @@
2524
$_aug_vals1 = regsubst($_vals, '"', '\'', 'G') #TODO
2625
$_aug_vals2 = regsubst($_aug_vals1, '^\s*$', '(null)')
2726
$_aug_vals3 = regsubst($_aug_vals2, '^(.*)$', '"\1"')
28-
$_changes = join_keys_to_values(
29-
hash(flatten(zip($_aug_keys, $_aug_vals3))),
30-
' ')
27+
$_changes = join_keys_to_values(flatten(zip($_aug_keys, $_aug_vals3)), ' ')
3128

3229
augeas { $filename:
3330
lens => 'OpenSM.lns',

0 commit comments

Comments
 (0)