|
 |
9e975f |
From 5bb44245c6c43d752c1e066ebdc6cb3eb0253d98 Mon Sep 17 00:00:00 2001
|
|
|
9e975f |
From: Thomas Woerner <twoerner@redhat.com>
|
|
|
9e975f |
Date: Wed, 4 Sep 2019 14:40:46 +0200
|
|
|
9e975f |
Subject: [PATCH] ansible_ipa_client: Drop import of
|
|
|
9e975f |
configure_nsswitch_database
|
|
|
9e975f |
|
|
|
9e975f |
configure_nsswitch_database has been removed with the freeipa commit
|
|
|
9e975f |
|
|
|
9e975f |
https://github.com/freeipa/freeipa/commit/41ef8fba31ddbb32e2e5b7cccdc9b582a0809111
|
|
|
9e975f |
|
|
|
9e975f |
The 4.4 compatibility hack leads to a ALREADY installed error in
|
|
|
9e975f |
ipaclient_test because of the removal. This affects ipaclient and
|
|
|
9e975f |
ipareplica roles and also the ipaclient deployment part in ipaserver.
|
|
|
9e975f |
|
|
|
9e975f |
configure_nsswitch_database is not used any more in ipaclient role modules
|
|
|
9e975f |
and therefore simply can be removed from ansible_ipa_client.
|
|
|
9e975f |
---
|
|
|
9e975f |
roles/ipaclient/module_utils/ansible_ipa_client.py | 6 ++----
|
|
|
9e975f |
1 file changed, 2 insertions(+), 4 deletions(-)
|
|
|
9e975f |
|
|
|
9e975f |
diff --git a/roles/ipaclient/module_utils/ansible_ipa_client.py b/roles/ipaclient/module_utils/ansible_ipa_client.py
|
|
|
9e975f |
index 30b8d42..d45171b 100644
|
|
|
9e975f |
--- a/roles/ipaclient/module_utils/ansible_ipa_client.py
|
|
|
9e975f |
+++ b/roles/ipaclient/module_utils/ansible_ipa_client.py
|
|
|
9e975f |
@@ -35,7 +35,7 @@
|
|
|
9e975f |
"configure_sssd_conf", "realm_to_suffix", "run", "timeconf",
|
|
|
9e975f |
"serialization", "configure_krb5_conf", "get_ca_certs",
|
|
|
9e975f |
"SECURE_PATH", "get_server_connection_interface",
|
|
|
9e975f |
- "configure_nsswitch_database", "disable_ra", "client_dns",
|
|
|
9e975f |
+ "disable_ra", "client_dns",
|
|
|
9e975f |
"configure_certmonger", "update_ssh_keys",
|
|
|
9e975f |
"configure_openldap_conf", "hardcode_ldap_server",
|
|
|
9e975f |
"get_certs_from_ldap", "save_state", "create_ipa_nssdb",
|
|
|
9e975f |
@@ -143,7 +143,7 @@ def knobs(self):
|
|
|
9e975f |
try:
|
|
|
9e975f |
from ipaclient.install.client import configure_krb5_conf, \
|
|
|
9e975f |
get_ca_certs, SECURE_PATH, get_server_connection_interface, \
|
|
|
9e975f |
- configure_nsswitch_database, disable_ra, client_dns, \
|
|
|
9e975f |
+ disable_ra, client_dns, \
|
|
|
9e975f |
configure_certmonger, update_ssh_keys, configure_openldap_conf, \
|
|
|
9e975f |
hardcode_ldap_server, get_certs_from_ldap, save_state, \
|
|
|
9e975f |
create_ipa_nssdb, configure_ssh_config, configure_sshd_config, \
|
|
|
9e975f |
@@ -204,8 +204,6 @@ def configure_krb5_conf(
|
|
|
9e975f |
|
|
|
9e975f |
get_server_connection_interface = \
|
|
|
9e975f |
ipa_client_install.get_server_connection_interface
|
|
|
9e975f |
- configure_nsswitch_database = \
|
|
|
9e975f |
- ipa_client_install.configure_nsswitch_database
|
|
|
9e975f |
disable_ra = ipa_client_install.disable_ra
|
|
|
9e975f |
client_dns = ipa_client_install.client_dns
|
|
|
9e975f |
configure_certmonger = ipa_client_install.configure_certmonger
|