fix: Fix removing kernel options with values (#146)

* fix: Fix removing kernel options with values

* Support Ansible 2.19, rename vars for clarity

Author: spetrosi

library/bootloader_settings.py

@@ -319,7 +319,9 @@ def mod_boot_args(module, result, bootloader_setting_options, kernel, kernel_inf
     for kernel_setting in bootloader_setting_options:
         setting_name = get_setting_name(kernel_setting)
         if "state" in kernel_setting and kernel_setting["state"] == "absent":
-            if re.search(r"(^|$| )" + setting_name + r"(^|$| )", bootloader_args):
+            if re.search(
+                r"(^|$| )" + kernel_setting["name"] + r"($| |=)", bootloader_args
+            ):
                 boot_absent_args += setting_name + " "
         else:
             if not re.search(r"(^|$| )" + setting_name + r"(^|$| )", bootloader_args):

tests/tests_settings.yml

@@ -66,11 +66,13 @@
                     value: 1
                   - name: no_timer_check
                     state: present
-                  - name: quiet
+                  - name: option_without_value
+                  - name: option_with_value
+                    value: option_value
                   - previous: replaced
               - kernel: ALL
                 options:
-                  - name: debug
+                  - name: option_set_from_ALL
                     state: present
             bootloader_timeout: 6
           include_role:
@@ -89,7 +91,7 @@
               (bootloader_facts |
               selectattr('index', 'search', cloned_kernel.index) | first).args |
               regex_search('^.*console=tty0 print-fatal-signals=1 no_timer_check
-              quiet debug( |)$')
+              option_without_value option_with_value=option_value option_set_from_ALL( |)$') | length > 0
 
         - name: Verify boot loader timeout configuration
           command: cat {{ __bootloader_grub_conf }}
@@ -106,9 +108,11 @@
               - kernel:
                   title: "{{ cloned_kernel.title }}"
                 options:
-                  - name: quiet
+                  - name: option_without_value
                     state: absent
-                  - name: debug
+                  - name: option_set_from_ALL
+                    state: absent
+                  - name: option_with_value
                     state: absent
             bootloader_timeout: 4
           include_role:
@@ -121,13 +125,15 @@
           assert:
             that: not (bootloader_reboot_required | d(false))
 
-        - name: Verify settings
+        - name: Verify that existing settings remained and removed settings are not present
+          vars:
+            __settings: "{{ (bootloader_facts | selectattr('index', 'search', cloned_kernel.index) | first).args }}"
           assert:
-            that: >-
-              (bootloader_facts |
-              selectattr('index', 'search', cloned_kernel.index) | first).args |
-              regex_search('^.*console=tty0 print-fatal-signals=1
-              no_timer_check( |)$')
+            that:
+              - __settings | regex_search('^.*console=tty0 print-fatal-signals=1 no_timer_check( |)$') | length > 0
+              - __settings | regex_search('option_without_value') == none
+              - __settings | regex_search('option_set_from_ALL')  == none
+              - __settings | regex_search('option_with_value') == none
 
         - name: Verify boot loader timeout configuration
           command: cat {{ __bootloader_grub_conf }}
@@ -164,7 +170,7 @@
               (bootloader_facts |
               selectattr('index', 'search', cloned_kernel.index) | first).args |
               regex_search('^.*console=tty0 print-fatal-signals=1
-              no_timer_check( |)$')
+              no_timer_check( |)$') | length > 0
 
         - name: Verify boot loader timeout configuration
           command: cat {{ __bootloader_grub_conf }}