From 492d5e3d05f70f5b28adbc718f11fe816b9b7846 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Fri, 19 Jun 2020 15:22:16 -0500 Subject: [PATCH 1/2] use FQCN for module call in action plugins Fixes https://github.com/ansible-collections/ansible.posix/issues/11 Signed-off-by: Adam Miller --- changelogs/fragments/11-action-plugins-use-fqcn.yml | 5 +++++ plugins/action/patch.py | 2 +- plugins/action/synchronize.py | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 changelogs/fragments/11-action-plugins-use-fqcn.yml diff --git a/changelogs/fragments/11-action-plugins-use-fqcn.yml b/changelogs/fragments/11-action-plugins-use-fqcn.yml new file mode 100644 index 0000000..a96bd80 --- /dev/null +++ b/changelogs/fragments/11-action-plugins-use-fqcn.yml @@ -0,0 +1,5 @@ +--- +bugfixes: + - patch - fix FQCN usage for action plugin (https://github.com/ansible-collections/ansible.posix/issues/11) + - synchronize - fix FQCN usage for action plugin (https://github.com/ansible-collections/ansible.posix/issues/11) + diff --git a/plugins/action/patch.py b/plugins/action/patch.py index f4ad7ce..3b477d7 100644 --- a/plugins/action/patch.py +++ b/plugins/action/patch.py @@ -64,7 +64,7 @@ class ActionModule(ActionBase): ) ) - result.update(self._execute_module('patch', module_args=new_module_args, task_vars=task_vars)) + result.update(self._execute_module('ansible.posix.patch', module_args=new_module_args, task_vars=task_vars)) except AnsibleAction as e: result.update(e.result) finally: diff --git a/plugins/action/synchronize.py b/plugins/action/synchronize.py index 527c72d..a1f5795 100644 --- a/plugins/action/synchronize.py +++ b/plugins/action/synchronize.py @@ -415,6 +415,6 @@ class ActionModule(ActionBase): _tmp_args['rsync_opts'].append("--rsh=buildah run --") # run the module and store the result - result.update(self._execute_module('synchronize', module_args=_tmp_args, task_vars=task_vars)) + result.update(self._execute_module('ansible.posix.synchronize', module_args=_tmp_args, task_vars=task_vars)) return result From 711e5fefddc6e2d8e285c71c1f819220137e3e8a Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Fri, 19 Jun 2020 17:14:38 -0500 Subject: [PATCH 2/2] make sanity tests happy Signed-off-by: Adam Miller --- changelogs/fragments/11-action-plugins-use-fqcn.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/changelogs/fragments/11-action-plugins-use-fqcn.yml b/changelogs/fragments/11-action-plugins-use-fqcn.yml index a96bd80..b41bf3d 100644 --- a/changelogs/fragments/11-action-plugins-use-fqcn.yml +++ b/changelogs/fragments/11-action-plugins-use-fqcn.yml @@ -2,4 +2,3 @@ bugfixes: - patch - fix FQCN usage for action plugin (https://github.com/ansible-collections/ansible.posix/issues/11) - synchronize - fix FQCN usage for action plugin (https://github.com/ansible-collections/ansible.posix/issues/11) -