From ff01a08ffc85c069f37692ad8307bf10e8bd1e29 Mon Sep 17 00:00:00 2001 From: Tomas Babej Date: Tue, 26 Mar 2013 16:09:24 +0100 Subject: Properly handle ipa-replica-install when its zone is not managed by IPA The ipa-replica-install script tries to add replica's A and PTR records to the master DNS, if master does manage DNS. However, master need not manage replica's zone. Properly handle this use case. https://fedorahosted.org/freeipa/ticket/3496 --- install/tools/ipa-replica-install | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install index af80c1e3..2c28f37c 100755 --- a/install/tools/ipa-replica-install +++ b/install/tools/ipa-replica-install @@ -302,13 +302,23 @@ def install_dns_records(config, options): # before our DS server is installed. with temporary_ldap2_connection( config.master_host_name, config.dirman_password): - bind = bindinstance.BindInstance(dm_password=config.dirman_password) - reverse_zone = bindinstance.find_reverse_zone(config.ip) + try: + bind = bindinstance.BindInstance(dm_password=config.dirman_password) + reverse_zone = bindinstance.find_reverse_zone(config.ip) + + bind.add_master_dns_records(config.host_name, config.ip_address, + config.realm_name, config.domain_name, + reverse_zone, options.conf_ntp, + options.setup_ca) + except errors.NotFound, e: + root_logger.debug('Replica DNS records could not be added ' + 'on master: %s', str(e)) + + # we should not fail here no matter what + except Exception, e: + root_logger.info('Replica DNS records could not be added ' + 'on master: %s', str(e)) - bind.add_master_dns_records(config.host_name, config.ip_address, - config.realm_name, config.domain_name, - reverse_zone, options.conf_ntp, - options.setup_ca) def check_dirsrv(): (ds_unsecure, ds_secure) = dsinstance.check_ports() -- cgit