From 0bef7bb164936d16718a17c54bf914f65951e44b Mon Sep 17 00:00:00 2001 From: Hideki Saito Date: Tue, 11 May 2021 17:56:26 +0900 Subject: [PATCH] Fix boot option handling on Solaris correctly * Fixes #184 Signed-off-by: Hideki Saito --- changelogs/fragments/185_mount_at_boot.yml | 3 +++ plugins/modules/mount.py | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/185_mount_at_boot.yml diff --git a/changelogs/fragments/185_mount_at_boot.yml b/changelogs/fragments/185_mount_at_boot.yml new file mode 100644 index 0000000..1979533 --- /dev/null +++ b/changelogs/fragments/185_mount_at_boot.yml @@ -0,0 +1,3 @@ +--- +bugfixes: +- "mount - Handle ``boot`` option on Solaris correctly (https://github.com/ansible-collections/ansible.posix/issues/184)." diff --git a/plugins/modules/mount.py b/plugins/modules/mount.py index e7ce7ee..dd7a5c0 100644 --- a/plugins/modules/mount.py +++ b/plugins/modules/mount.py @@ -180,6 +180,7 @@ from ansible.module_utils.basic import AnsibleModule from ansible_collections.ansible.posix.plugins.module_utils.mount import ismount from ansible.module_utils.six import iteritems from ansible.module_utils._text import to_bytes, to_native +from ansible.module_utils.parsing.convert_bool import boolean def write_fstab(module, lines, path): @@ -672,7 +673,7 @@ def main(): opts='-', passno='-', fstab=module.params['fstab'], - boot='yes' + boot='yes' if module.params['boot'] else 'no' ) if args['fstab'] is None: args['fstab'] = '/etc/vfstab' @@ -834,6 +835,10 @@ def main(): else: module.fail_json(msg='Unexpected position reached') + # If the managed node is Solaris, convert the boot value type to Boolean + # to match the type of return value with the module argument. + if platform.system().lower() == 'sunos': + args['boot'] = boolean(args['boot']) module.exit_json(changed=changed, **args)