From ca2a9f860154d43b21284b1cef5ce4d17e4d7197 Mon Sep 17 00:00:00 2001 From: Watson Sato Date: Thu, 21 Jan 2021 18:27:23 +0100 Subject: [PATCH 1/2] Fix syntax issue in when clause Previous clause ran into issues with Ansible 2.9 --- shared/templates/sudo_defaults_option/ansible.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/templates/sudo_defaults_option/ansible.template b/shared/templates/sudo_defaults_option/ansible.template index 127fa6afdd22..63f85e52fa27 100644 --- a/shared/templates/sudo_defaults_option/ansible.template +++ b/shared/templates/sudo_defaults_option/ansible.template @@ -19,7 +19,7 @@ path: /etc/sudoers line: 'Defaults {{{ OPTION }}}={{ {{{ VARIABLE_NAME }}} }}' validate: /usr/sbin/visudo -cf %s - when: edit_sudoers_{{{ OPTION }}}_option.changed is false + when: not edit_sudoers_{{{ OPTION }}}_option.changed {{% else %}} - name: Ensure {{{ OPTION }}} is enabled in /etc/sudoers lineinfile: From 1ff8a08ddf9be25be87997b469a225c874ed5959 Mon Sep 17 00:00:00 2001 From: Watson Sato Date: Thu, 21 Jan 2021 18:39:15 +0100 Subject: [PATCH 2/2] Check if Ansible variable is defined before use --- shared/templates/sudo_defaults_option/ansible.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/templates/sudo_defaults_option/ansible.template b/shared/templates/sudo_defaults_option/ansible.template index 63f85e52fa27..79492e1b856b 100644 --- a/shared/templates/sudo_defaults_option/ansible.template +++ b/shared/templates/sudo_defaults_option/ansible.template @@ -19,7 +19,7 @@ path: /etc/sudoers line: 'Defaults {{{ OPTION }}}={{ {{{ VARIABLE_NAME }}} }}' validate: /usr/sbin/visudo -cf %s - when: not edit_sudoers_{{{ OPTION }}}_option.changed + when: edit_sudoers_{{{ OPTION }}}_option is defined and not edit_sudoers_{{{ OPTION }}}_option.changed {{% else %}} - name: Ensure {{{ OPTION }}} is enabled in /etc/sudoers lineinfile: