diff options
| -rw-r--r-- | changelogs/fragments/83601-debconf-normalize-bools.yml | 3 | ||||
| -rw-r--r-- | lib/ansible/modules/debconf.py | 8 | ||||
| -rw-r--r-- | test/integration/targets/debconf/tasks/main.yml | 28 |
3 files changed, 34 insertions, 5 deletions
diff --git a/changelogs/fragments/83601-debconf-normalize-bools.yml b/changelogs/fragments/83601-debconf-normalize-bools.yml new file mode 100644 index 0000000000..e2eec66a8d --- /dev/null +++ b/changelogs/fragments/83601-debconf-normalize-bools.yml @@ -0,0 +1,3 @@ +--- +bugfixes: + - debconf - fix normalization of value representation for boolean vtypes in new packages (https://github.com/ansible/ansible/issues/83594) diff --git a/lib/ansible/modules/debconf.py b/lib/ansible/modules/debconf.py index 0ffaf0e79b..69bc1534a0 100644 --- a/lib/ansible/modules/debconf.py +++ b/lib/ansible/modules/debconf.py @@ -173,8 +173,6 @@ def set_selection(module, pkg, question, vtype, value, unseen): if unseen: cmd.append('-u') - if vtype == 'boolean': - value = value.lower() data = ' '.join([pkg, question, vtype, value]) return module.run_command(cmd, data=data) @@ -209,15 +207,17 @@ def main(): if vtype is None or value is None: module.fail_json(msg="when supplying a question you must supply a valid vtype and value") + # ensure we compare booleans supplied to the way debconf sees them (true/false strings) + if vtype == 'boolean': + value = to_text(value).lower() + # if question doesn't exist, value cannot match if question not in prev: changed = True else: existing = prev[question] - # ensure we compare booleans supplied to the way debconf sees them (true/false strings) if vtype == 'boolean': - value = to_text(value).lower() existing = to_text(prev[question]).lower() elif vtype == 'password': existing = get_password_value(module, pkg, question, vtype) diff --git a/test/integration/targets/debconf/tasks/main.yml b/test/integration/targets/debconf/tasks/main.yml index 4021349f17..1b5877e034 100644 --- a/test/integration/targets/debconf/tasks/main.yml +++ b/test/integration/targets/debconf/tasks/main.yml @@ -146,6 +146,32 @@ - not debconf_multiselect_test_idem_4.changed - '"Invalid value provided" in debconf_multiselect_test_idem_4.msg' + - name: Boolean vtype from boolean value + debconf: + name: libnns-ldap + question: libnss-ldapd/clean_nsswitch + vtype: boolean + value: true + register: debconf_bool_test_bool_1 + + - name: validate results for boolean vtype from boolean value + assert: + that: + - debconf_bool_test_bool_1.changed + + - name: Boolean vtype from string value + debconf: + name: libnns-ldap + question: libnss-ldapd/clean_nsswitch + vtype: boolean + value: "FALSE" + register: debconf_bool_test_bool_2 + + - name: validate results for boolean vtype from string value + assert: + that: + - debconf_bool_test_bool_2.changed + always: - name: uninstall debconf-utils apt: @@ -153,4 +179,4 @@ state: absent when: debconf_utils_deb_install is changed - when: ansible_distribution in ('Ubuntu', 'Debian')
\ No newline at end of file + when: ansible_distribution in ('Ubuntu', 'Debian') |