@@ -118,7 +118,7 @@ def validate_kernel_initrd(module, bootloader_setting_kernel, kernel_mod_keys):
118118 and "initrd" in bootloader_setting_kernel .keys ()
119119 ):
120120 module .fail_json (
121- "You can use 'initrd' as a kernel key only when you must create a kernel. To modify or remove an existing kernel, use one of %s"
121+ msg = "You can use 'initrd' as a kernel key only when you must create a kernel. To modify or remove an existing kernel, use one of %s"
122122 % ", " .join (kernel_mod_keys )
123123 )
124124
@@ -165,7 +165,7 @@ def validate_default_kernel(module, bootloader_settings):
165165 kernel = bootloader_setting ["kernel" ]
166166 if isinstance (kernel , str ):
167167 module .fail_json (
168- "You cannot set a kernel as default when you are using a string kernel - %s"
168+ msg = "You cannot set a kernel as default when you are using a string kernel - %s"
169169 % (kernel )
170170 )
171171 if isinstance (kernel , dict ):
@@ -178,7 +178,7 @@ def validate_default_kernel(module, bootloader_settings):
178178 default_kernels .append (kernel_id )
179179 if default_count > 1 :
180180 module .fail_json (
181- "Only one kernel can be set as default. Found %d kernels with 'default: true' - %s"
181+ msg = "Only one kernel can be set as default. Found %d kernels with 'default: true' - %s"
182182 % (default_count , ", " .join (default_kernels ))
183183 )
184184
@@ -196,21 +196,21 @@ def validate_kernels(module, bootloader_setting, bootloader_facts):
196196 state = bootloader_setting .get ("state" , "present" )
197197
198198 if "state" in bootloader_setting and bootloader_setting ["state" ] not in states :
199- module .fail_json ("State must be one of '%s'" % ", " .join (states ))
199+ module .fail_json (msg = "State must be one of '%s'" % ", " .join (states ))
200200
201201 if (not isinstance (bootloader_setting ["kernel" ], dict )) and (
202202 not isinstance (bootloader_setting ["kernel" ], str )
203203 ):
204204 module .fail_json (
205- "kernel value in %s must be of type str or dict"
205+ msg = "kernel value in %s must be of type str or dict"
206206 % bootloader_setting ["kernel" ]
207207 )
208208
209209 if (isinstance (bootloader_setting ["kernel" ], str )) and (
210210 bootloader_setting ["kernel" ] not in kernel_str_values
211211 ):
212212 module .fail_json (
213- "kernel %s is of type str, it must be one of '%s'"
213+ msg = "kernel %s is of type str, it must be one of '%s'"
214214 % (
215215 bootloader_setting ["kernel" ],
216216 ", " .join (kernel_str_values ),
@@ -227,7 +227,7 @@ def validate_kernels(module, bootloader_setting, bootloader_facts):
227227 for key , value in bootloader_setting ["kernel" ].items ():
228228 if key not in kernel_keys :
229229 module .fail_json (
230- "kernel key in '%s: %s' must be one of '%s'"
230+ msg = "kernel key in '%s: %s' must be one of '%s'"
231231 % (
232232 key ,
233233 value ,
@@ -236,7 +236,7 @@ def validate_kernels(module, bootloader_setting, bootloader_facts):
236236 )
237237 if (not isinstance (value , str )) and (not isinstance (value , int )):
238238 module .fail_json (
239- "kernel value in '%s: %s' must be of type str or int" % (key , value )
239+ msg = "kernel value in '%s: %s' must be of type str or int" % (key , value )
240240 )
241241
242242 # Validate with len(bootloader_setting["kernel"]) == 1
@@ -255,7 +255,7 @@ def validate_kernels(module, bootloader_setting, bootloader_facts):
255255 diff , same = compare_dicts (bootloader_setting ["kernel" ], fact_trunc )
256256 if diff and same :
257257 module .fail_json (
258- "A kernel with provided %s already exists and its other fields are different %s"
258+ msg = "A kernel with provided %s already exists and its other fields are different %s"
259259 % (same , diff )
260260 )
261261 elif not diff and same :
@@ -268,7 +268,7 @@ def validate_kernels(module, bootloader_setting, bootloader_facts):
268268 sorted (bootloader_setting ["kernel" ].keys ()) != sorted (kernel_create_keys )
269269 ):
270270 module .fail_json (
271- "To create a kernel, you must provide 3 kernel keys - '%s'"
271+ msg = "To create a kernel, you must provide 3 kernel keys - '%s'"
272272 % ", " .join (kernel_create_keys )
273273 )
274274 kernel_action = "create" if state == "present" else "remove"
@@ -407,7 +407,7 @@ def rm_kernel(module, result, kernel):
407407
408408def get_default_kernel (module , type ):
409409 if type not in ["kernel" , "title" , "index" ]:
410- module .fail_json ("Type must be one of 'kernel', 'title', or 'index'" )
410+ module .fail_json (msg = "Type must be one of 'kernel', 'title', or 'index'" )
411411 cmd = "grubby --default-" + type
412412 _unused , stdout , _unused = module .run_command (cmd )
413413 return stdout .strip ()
@@ -437,7 +437,7 @@ def run_module():
437437 for bootloader_setting in module .params ["bootloader_settings" ]:
438438 _unused , kernels_info , stderr = module .run_command ("grubby --info=ALL" )
439439 if "Permission denied" in stderr :
440- module .fail_json ("You must run this as sudo" )
440+ module .fail_json (msg = "You must run this as sudo" )
441441
442442 default_kernel_index = get_default_kernel (module , "index" )
443443 bootloader_facts = get_facts (kernels_info , default_kernel_index )
0 commit comments