From 80aac15de9026055ae2b9972859939cf7925b813 Mon Sep 17 00:00:00 2001 From: Thomas Woerner Date: Tue, 30 Jun 2020 17:32:19 +0200 Subject: [PATCH] action_plugins/ipaclient_get_otp: Discovered python needed in task_vars Ansible is now also supporting discovered_python_interpreter for action_plugins. task_vars needs to be non Null and contain a setting for discovered_python_interpreter. The ipaclient_get_otp action_plugin therefore needed to be adapted. --- roles/ipaclient/action_plugins/ipaclient_get_otp.py | 4 ++-- roles/ipaclient/tasks/install.yml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/roles/ipaclient/action_plugins/ipaclient_get_otp.py b/roles/ipaclient/action_plugins/ipaclient_get_otp.py index dcddc0a..8e04ad9 100644 --- a/roles/ipaclient/action_plugins/ipaclient_get_otp.py +++ b/roles/ipaclient/action_plugins/ipaclient_get_otp.py @@ -164,7 +164,8 @@ class ActionModule(ActionBase): return result data = self._execute_module(module_name='ipaclient_get_facts', - module_args=dict(), task_vars=None) + module_args=dict(), task_vars=task_vars) + try: domain = data['ansible_facts']['ipa']['domain'] realm = data['ansible_facts']['ipa']['realm'] @@ -245,4 +246,3 @@ class ActionModule(ActionBase): finally: # delete the local temp directory shutil.rmtree(local_temp_dir, ignore_errors=True) - run_cmd(['/usr/bin/kdestroy', '-c', tmp_ccache]) diff --git a/roles/ipaclient/tasks/install.yml b/roles/ipaclient/tasks/install.yml index 0de3dea..4421f0c 100644 --- a/roles/ipaclient/tasks/install.yml +++ b/roles/ipaclient/tasks/install.yml @@ -134,7 +134,6 @@ "Password cannot be set on enrolled host" not in result_ipaclient_get_otp.msg delegate_to: "{{ result_ipaclient_test.servers[0] }}" - delegate_facts: yes ignore_errors: yes - name: Install - Report error for OTP generation -- 2.26.2