From 01b5904e2dbee627d34e22ed766c85bf9758b3a5 Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Oct 08 2020 13:53:12 +0000 Subject: Simplify update code resolve_ip_addresses_nss(host) is equivalent to get_server_ip_address(api.env.host, True, False, []). The function get_server_ip_address() is designed to perform interactive checks that should not be triggered in automatic upgrade code. Related: https://pagure.io/freeipa/issue/8275 Signed-off-by: Christian Heimes Reviewed-By: Alexander Bokovoy --- diff --git a/ipaserver/install/server/upgrade.py b/ipaserver/install/server/upgrade.py index cb19c04..140cf05 100644 --- a/ipaserver/install/server/upgrade.py +++ b/ipaserver/install/server/upgrade.py @@ -1402,8 +1402,9 @@ def upgrade_bind(fstore): # resolve1's stub resolver config file. has_resolved_ipa_conf = os.path.isfile(paths.SYSTEMD_RESOLVED_IPA_CONF) if not has_resolved_ipa_conf and detect_resolve1_resolv_conf(): - ip_addresses = installutils.get_server_ip_address( - api.env.host, True, False, []) + ip_addresses = installutils.resolve_ip_addresses_nss( + api.env.host + ) bind.ip_addresses = ip_addresses bind.setup_resolv_conf() logger.info("Updated systemd-resolved configuration")