From c69d0bc53f181a6346695875ceb29ee054868919 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Mon, 12 Aug 2019 18:33:34 +0200
Subject: [PATCH] ansible_freeipa_module: Add ansible module argument to
valid_creds function
For debug and error reporting it is needed to have the ansible module also
in the valid_creds function.
---
plugins/module_utils/ansible_freeipa_module.py | 4 ++--
plugins/modules/ipagroup.py | 2 +-
plugins/modules/ipatopologysegment.py | 2 +-
plugins/modules/ipauser.py | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/plugins/module_utils/ansible_freeipa_module.py b/plugins/module_utils/ansible_freeipa_module.py
index 0b6c6e55..c54a1cc0 100644
--- a/plugins/module_utils/ansible_freeipa_module.py
+++ b/plugins/module_utils/ansible_freeipa_module.py
@@ -37,7 +37,7 @@ from ipaplatform.paths import paths
from ipalib.krb_utils import get_credentials_if_valid
-def valid_creds(principal):
+def valid_creds(module, principal):
"""
Get valid credintials matching the princial
"""
@@ -110,7 +110,7 @@ def execute_api_command(module, principal, password, command, name, args):
ccache_dir = None
ccache_name = None
try:
- if not valid_creds(principal):
+ if not valid_creds(module, principal):
ccache_dir, ccache_name = temp_kinit(principal, password)
api_connect()
diff --git a/plugins/modules/ipagroup.py b/plugins/modules/ipagroup.py
index 48266f58..eb76a283 100644
--- a/plugins/modules/ipagroup.py
+++ b/plugins/modules/ipagroup.py
@@ -272,7 +272,7 @@ def main():
ccache_dir = None
ccache_name = None
try:
- if not valid_creds(ipaadmin_principal):
+ if not valid_creds(ansible_module, ipaadmin_principal):
ccache_dir, ccache_name = temp_kinit(ipaadmin_principal,
ipaadmin_password)
api_connect()
diff --git a/plugins/modules/ipatopologysegment.py b/plugins/modules/ipatopologysegment.py
index e506b53d..5740cded 100644
--- a/plugins/modules/ipatopologysegment.py
+++ b/plugins/modules/ipatopologysegment.py
@@ -217,7 +217,7 @@ def main():
ccache_dir = None
ccache_name = None
try:
- if not valid_creds(ipaadmin_principal):
+ if not valid_creds(ansible_module, ipaadmin_principal):
ccache_dir, ccache_name = temp_kinit(ipaadmin_principal,
ipaadmin_password)
api_connect()
diff --git a/plugins/modules/ipauser.py b/plugins/modules/ipauser.py
index 04a49ecd..748eb841 100644
--- a/plugins/modules/ipauser.py
+++ b/plugins/modules/ipauser.py
@@ -353,7 +353,7 @@ def main():
ccache_dir = None
ccache_name = None
try:
- if not valid_creds(ipaadmin_principal):
+ if not valid_creds(ansible_module, ipaadmin_principal):
ccache_dir, ccache_name = temp_kinit(ipaadmin_principal,
ipaadmin_password)
api_connect()
--
GitLab