summaryrefslogtreecommitdiffstats
path: root/install
diff options
context:
space:
mode:
authorSimo Sorce <ssorce@redhat.com>2011-01-24 11:42:53 -0500
committerSimo Sorce <ssorce@redhat.com>2011-01-25 14:01:35 -0500
commit34cedfe138fe97841a673b83b7e6a978617d28bf (patch)
tree4a37d0d7fd37de052231413e52a2bed2e5572db0 /install
parentcec3978c799220164ba0f560d3e764a0d879bb05 (diff)
downloadfreeipa-34cedfe138fe97841a673b83b7e6a978617d28bf.tar.gz
freeipa-34cedfe138fe97841a673b83b7e6a978617d28bf.tar.xz
freeipa-34cedfe138fe97841a673b83b7e6a978617d28bf.zip
Create DNS records as early as possible
Fixes: https://fedorahosted.org/freeipa/ticket/833
Diffstat (limited to 'install')
-rwxr-xr-xinstall/tools/ipa-replica-install19
1 files changed, 15 insertions, 4 deletions
diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install
index b53ceeea4..9fca31ff7 100755
--- a/install/tools/ipa-replica-install
+++ b/install/tools/ipa-replica-install
@@ -270,12 +270,18 @@ def install_bind(config, options):
def install_dns_records(config, options):
- if not bindinstance.dns_container_exists(config.host_name,
+ if not bindinstance.dns_container_exists(config.master_host_name,
util.realm_to_suffix(config.realm_name)):
return
+ # We have to force to connect to the remote master because we do this step
+ # before our DS server is installed.
+ cur_uri = api.Backend.ldap2.ldap_uri
+ object.__setattr__(api.Backend.ldap2, 'ldap_uri',
+ 'ldaps://%s' % config.master_host_name)
api.Backend.ldap2.connect(bind_dn="cn=Directory Manager",
- bind_pw=config.dirman_password)
+ bind_pw=config.dirman_password,
+ tls_cacertfile=CACERT)
bind = bindinstance.BindInstance(dm_password=config.dirman_password)
ip_address = resolve_host(config.host_name)
if not ip_address:
@@ -285,6 +291,10 @@ def install_dns_records(config, options):
config.realm_name, config.domain_name,
options.conf_ntp)
+ #set it back to the default
+ api.Backend.ldap2.disconnect()
+ object.__setattr__(api.Backend.ldap2, 'ldap_uri', cur_uri)
+
def check_dirsrv():
serverids = dsinstance.check_existing_installation()
if serverids:
@@ -421,6 +431,9 @@ def main():
# Configure the CA if necessary
CA = install_ca(config)
+ # Always try to install DNS records
+ install_dns_records(config, options)
+
# Configure dirsrv
ds = install_replica_ds(config)
@@ -452,8 +465,6 @@ def main():
if options.setup_dns:
install_bind(config, options)
- else:
- install_dns_records(config, options)
# Call client install script
try: