summaryrefslogtreecommitdiffstats
path: root/ipaserver
diff options
context:
space:
mode:
authorPetr Spacek <pspacek@redhat.com>2016-01-07 16:05:20 +0100
committerMartin Basti <mbasti@redhat.com>2016-01-08 10:14:51 +0100
commit3d1a8d31343ce0a71d3236e9d8457a06e12c07a9 (patch)
treed11fb478a6c9f087d15e5760955919a48b58e638 /ipaserver
parent17a4a29c251797261d91e3ec25aedfd985dbd238 (diff)
downloadfreeipa-3d1a8d31343ce0a71d3236e9d8457a06e12c07a9.tar.gz
freeipa-3d1a8d31343ce0a71d3236e9d8457a06e12c07a9.tar.xz
freeipa-3d1a8d31343ce0a71d3236e9d8457a06e12c07a9.zip
Fix DNS zone overlap check to allow ipa-replica-install to work
https://fedorahosted.org/freeipa/ticket/5564 Reviewed-By: David Kupka <dkupka@redhat.com>
Diffstat (limited to 'ipaserver')
-rw-r--r--ipaserver/install/server/replicainstall.py34
1 files changed, 19 insertions, 15 deletions
diff --git a/ipaserver/install/server/replicainstall.py b/ipaserver/install/server/replicainstall.py
index 78e32ae9b..150325b82 100644
--- a/ipaserver/install/server/replicainstall.py
+++ b/ipaserver/install/server/replicainstall.py
@@ -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: