user: check for password with byte size of 16 and 20

jhoblitt · Mar 14, 2024 · 8c40b75 · 8c40b75
1 parent b994667
commit 8c40b75
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/manifests/user.pp b/manifests/user.pp
@@ -66,11 +66,19 @@
       notify  => [Exec["ipmi_user_enable_${title}"], Exec["ipmi_user_enable_sol_${title}"], Exec["ipmi_user_channel_setaccess_${title}"]],
     }
 
+    $unless_cmd = @("CMD"/L$)
+      /usr/bin/ipmitool user test ${user_id} 16 "\$PASSWORD" ||
+      /usr/bin/ipmitool user test ${user_id} 20 "\$PASSWORD"
+      |- CMD
     exec { "ipmi_user_setpw_${title}":
       environment => ["PASSWORD=${real_password}"],
       command     => "/usr/bin/ipmitool user set password ${user_id} \"\$PASSWORD\"",
-      unless      => "/usr/bin/ipmitool user test ${user_id} 16 \"\$PASSWORD\"",
-      notify      => [Exec["ipmi_user_enable_${title}"], Exec["ipmi_user_enable_sol_${title}"], Exec["ipmi_user_channel_setaccess_${title}"]],
+      unless      => $unless_cmd,
+      notify      => Exec[
+        "ipmi_user_enable_${title}",
+        "ipmi_user_enable_sol_${title}",
+        "ipmi_user_channel_setaccess_${title}"
+      ],
     }
 
     exec { "ipmi_user_enable_sol_${title}":