diff --git a/plugins/modules/ipahost.py b/plugins/modules/ipahost.py index 6600d81d09bfae47defc69c87545221a0f846551..24acaa36121100953590cfb4fa11e9a663888897 100644 --- a/plugins/modules/ipahost.py +++ b/plugins/modules/ipahost.py @@ -510,7 +510,8 @@ host: from ansible.module_utils.ansible_freeipa_module import \ IPAAnsibleModule, compare_args_ipa, gen_add_del_lists, \ encode_certificate, is_ipv4_addr, is_ipv6_addr, ipalib_errors, \ - gen_add_list, gen_intersection_list, normalize_sshpubkey + gen_add_list, gen_intersection_list, normalize_sshpubkey, \ + convert_input_certificates from ansible.module_utils import six if six.PY3: unicode = str @@ -682,13 +683,6 @@ def check_authind(module, auth_ind): "by your IPA version" % "','".join(_invalid)) -def convert_certificate(certificate): - if certificate is None: - return None - - return [cert.strip() for cert in certificate] - - # pylint: disable=unused-argument def result_handler(module, result, command, name, args, exit_args, single_host): @@ -894,7 +888,8 @@ def main(): auth_ind, requires_pre_auth, ok_as_delegate, ok_to_auth_as_delegate, force, reverse, ip_address, update_dns, update_password) - certificate = convert_certificate(certificate) + certificate = convert_input_certificates(ansible_module, certificate, + state) if sshpubkey is not None: sshpubkey = [str(normalize_sshpubkey(key)) for key in sshpubkey] @@ -982,7 +977,8 @@ def main(): ok_to_auth_as_delegate, force, reverse, ip_address, update_dns, update_password) - certificate = convert_certificate(certificate) + certificate = convert_input_certificates(ansible_module, + certificate, state) if sshpubkey is not None: sshpubkey = [str(normalize_sshpubkey(key)) for