IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2026-07-29 23:58:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix DNS zone overlap check to allow ipa-replica-install to work

Browse Source 
https://fedorahosted.org/freeipa/ticket/5564

Reviewed-By: David Kupka <dkupka@redhat.com>
This commit is contained in:
Petr Spacek
2016-01-08 10:14:51 +01:00
committed by Martin Basti
parent 17a4a29c25
commit 3d1a8d3134
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ipaserver/install/server/replicainstall.py
+19 -15
View File
@@ -639,6 +639,16 @@ def install_check(installer):
except RuntimeError as e:
print(str(e))
sys.exit(1)
if options.setup_dns:
dns.install_check(False, remote_api, True, options,
config.host_name)
config.ips = dns.ip_addresses
else:
config.ips = installutils.get_server_ip_address(
config.host_name, not installer.interactive, False,
options.ip_addresses)
except errors.ACIError:
sys.exit("\nThe password provided is incorrect for LDAP server "
"%s" % config.master_host_name)
@@ -651,14 +661,6 @@ def install_check(installer):
if conn.isconnected():
conn.disconnect()
if options.setup_dns:
dns.install_check(False, remote_api, True, options, config.host_name)
config.ips = dns.ip_addresses
else:
config.ips = installutils.get_server_ip_address(
config.host_name, not installer.interactive, False,
options.ip_addresses)
# installer needs to update hosts file when DNS subsystem will be
# installed or custom addresses are used
if options.setup_dns or options.ip_addresses:
@@ -1162,6 +1164,15 @@ def promote_check(installer):
except RuntimeError as e:
print(str(e))
sys.exit(1)
if options.setup_dns:
dns.install_check(False, remote_api, True, options,
config.host_name)
else:
config.ips = installutils.get_server_ip_address(
config.host_name, not installer.interactive,
False, options.ip_addresses)
except errors.ACIError:
sys.exit("\nInsufficient privileges to promote the server.")
except errors.LDAPError:
@@ -1173,13 +1184,6 @@ def promote_check(installer):
if conn.isconnected():
conn.disconnect()
if options.setup_dns:
dns.install_check(False, remote_api, True, options, config.host_name)
else:
config.ips = installutils.get_server_ip_address(
config.host_name, not installer.interactive,
False, options.ip_addresses)
# check connection
if not options.skip_conncheck:
if add_to_ipaservers: