From 5bb44245c6c43d752c1e066ebdc6cb3eb0253d98 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Wed, 4 Sep 2019 14:40:46 +0200
Subject: [PATCH] ansible_ipa_client: Drop import of
 configure_nsswitch_database

configure_nsswitch_database has been removed with the freeipa commit

https://github.com/freeipa/freeipa/commit/41ef8fba31ddbb32e2e5b7cccdc9b582a0809111

The 4.4 compatibility hack leads to a ALREADY installed error in
ipaclient_test because of the removal. This affects ipaclient and
ipareplica roles and also the ipaclient deployment part in ipaserver.

configure_nsswitch_database is not used any more in ipaclient role modules
and therefore simply can be removed from ansible_ipa_client.
---
 roles/ipaclient/module_utils/ansible_ipa_client.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/roles/ipaclient/module_utils/ansible_ipa_client.py b/roles/ipaclient/module_utils/ansible_ipa_client.py
index 30b8d42..d45171b 100644
--- a/roles/ipaclient/module_utils/ansible_ipa_client.py
+++ b/roles/ipaclient/module_utils/ansible_ipa_client.py
@@ -35,7 +35,7 @@
            "configure_sssd_conf", "realm_to_suffix", "run", "timeconf",
            "serialization", "configure_krb5_conf", "get_ca_certs",
            "SECURE_PATH", "get_server_connection_interface",
-           "configure_nsswitch_database", "disable_ra", "client_dns",
+           "disable_ra", "client_dns",
            "configure_certmonger", "update_ssh_keys",
            "configure_openldap_conf", "hardcode_ldap_server",
            "get_certs_from_ldap", "save_state", "create_ipa_nssdb",
@@ -143,7 +143,7 @@ def knobs(self):
     try:
         from ipaclient.install.client import configure_krb5_conf, \
             get_ca_certs, SECURE_PATH, get_server_connection_interface, \
-            configure_nsswitch_database, disable_ra, client_dns, \
+            disable_ra, client_dns, \
             configure_certmonger, update_ssh_keys, configure_openldap_conf, \
             hardcode_ldap_server, get_certs_from_ldap, save_state, \
             create_ipa_nssdb, configure_ssh_config, configure_sshd_config, \
@@ -204,8 +204,6 @@ def configure_krb5_conf(
 
         get_server_connection_interface = \
             ipa_client_install.get_server_connection_interface
-        configure_nsswitch_database = \
-            ipa_client_install.configure_nsswitch_database
         disable_ra = ipa_client_install.disable_ra
         client_dns = ipa_client_install.client_dns
         configure_certmonger = ipa_client_install.configure_certmonger