From 01d06f6be3d154e4ecf8d24c55e6f8034d983d8d Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Fri, 19 Jun 2020 09:09:57 -0500 Subject: [PATCH 1/2] mount - fix module_util pathing issue for ansible 2.9 In Ansible 2.9 (pre 2.10 routing), the AnsiballZ creation of the payload will add an extra directory to the module_util path because ismount.py shares the same name as it's parent dir which creates an inconsistency in the payload creation. This causes the Collection module ansible.posix.mount to work in Ansible 2.10 but not 2.9, with this pull request a simple renaming of the module_util which side steps this inconsistency. Fixes https://github.com/ansible-collections/ansible.posix/issues/21 Signed-off-by: Adam Miller --- changelogs/fragments/21-mount-module_util-routing-issue.yml | 3 +++ plugins/module_utils/{ismount.py => mount.py} | 0 plugins/modules/mount.py | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/21-mount-module_util-routing-issue.yml rename plugins/module_utils/{ismount.py => mount.py} (100%) diff --git a/changelogs/fragments/21-mount-module_util-routing-issue.yml b/changelogs/fragments/21-mount-module_util-routing-issue.yml new file mode 100644 index 0000000..08563a2 --- /dev/null +++ b/changelogs/fragments/21-mount-module_util-routing-issue.yml @@ -0,0 +1,3 @@ +--- +bugfixes: + - mount - fix issues with ismount module_util pathing for Ansible 2.9 (fixes https://github.com/ansible-collections/ansible.posix/issues/21) diff --git a/plugins/module_utils/ismount.py b/plugins/module_utils/mount.py similarity index 100% rename from plugins/module_utils/ismount.py rename to plugins/module_utils/mount.py diff --git a/plugins/modules/mount.py b/plugins/modules/mount.py index 1fbf716..8c22f66 100644 --- a/plugins/modules/mount.py +++ b/plugins/modules/mount.py @@ -176,7 +176,7 @@ import os import platform from ansible.module_utils.basic import AnsibleModule -from ansible_collections.ansible.posix.plugins.module_utils.ismount import ismount +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 f7ac380b8290588b7da60c841625bbd6cb6eefd1 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Fri, 19 Jun 2020 10:26:09 -0500 Subject: [PATCH 2/2] remove references to ismount.py for tests Signed-off-by: Adam Miller --- .github/BOTMETA.yml | 4 ++-- tests/sanity/ignore-2.10.txt | 4 ++-- tests/sanity/ignore-2.9.txt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/BOTMETA.yml b/.github/BOTMETA.yml index a3818cf..62b9194 100644 --- a/.github/BOTMETA.yml +++ b/.github/BOTMETA.yml @@ -1,7 +1,7 @@ automerge: false files: - $module_utils/ismount.py: - labels: ismount + $module_utils/mount.py: + labels: mount $modules/acl.py: authors: astorije bcoca labels: acl diff --git a/tests/sanity/ignore-2.10.txt b/tests/sanity/ignore-2.10.txt index 0b5a4a1..75dc74e 100644 --- a/tests/sanity/ignore-2.10.txt +++ b/tests/sanity/ignore-2.10.txt @@ -1,5 +1,5 @@ -plugins/module_utils/ismount.py future-import-boilerplate -plugins/module_utils/ismount.py metaclass-boilerplate +plugins/module_utils/mount.py future-import-boilerplate +plugins/module_utils/mount.py metaclass-boilerplate plugins/modules/acl.py validate-modules:parameter-type-not-in-doc plugins/modules/patch.py pylint:blacklisted-name plugins/modules/synchronize.py pylint:blacklisted-name diff --git a/tests/sanity/ignore-2.9.txt b/tests/sanity/ignore-2.9.txt index 065fb1f..1308768 100644 --- a/tests/sanity/ignore-2.9.txt +++ b/tests/sanity/ignore-2.9.txt @@ -1,5 +1,5 @@ -plugins/module_utils/ismount.py future-import-boilerplate -plugins/module_utils/ismount.py metaclass-boilerplate +plugins/module_utils/mount.py future-import-boilerplate +plugins/module_utils/mount.py metaclass-boilerplate plugins/modules/acl.py validate-modules:parameter-type-not-in-doc plugins/modules/synchronize.py pylint:blacklisted-name plugins/modules/synchronize.py use-argspec-type-path