diff options
| author | David Kupka <dkupka@redhat.com> | 2015-07-03 05:59:55 +0200 |
|---|---|---|
| committer | Tomas Babej <tbabej@redhat.com> | 2015-07-08 00:37:42 +0200 |
| commit | 6a91893ff50fee6d7c71d9bc982d85a3ec8b7583 (patch) | |
| tree | 56b9fffe90639141bbb5ed076cd856609f4ccf1f | |
| parent | ea7f392bb98c1f1c4558ec5d6e84ee7a7c613474 (diff) | |
| download | freeipa-6a91893ff50fee6d7c71d9bc982d85a3ec8b7583.tar.gz freeipa-6a91893ff50fee6d7c71d9bc982d85a3ec8b7583.tar.xz freeipa-6a91893ff50fee6d7c71d9bc982d85a3ec8b7583.zip | |
ipa-replica-prepare: Do not create DNS zone it automatically.
When --ip-address is specified check if relevant DNS zone exists
in IPA managed DNS server, exit with error when not.
https://fedorahosted.org/freeipa/ticket/5014
Reviewed-By: Martin Basti <mbasti@redhat.com>
| -rw-r--r-- | ipaserver/install/ipa_replica_prepare.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/ipaserver/install/ipa_replica_prepare.py b/ipaserver/install/ipa_replica_prepare.py index 46ac886e5..5246f5f54 100644 --- a/ipaserver/install/ipa_replica_prepare.py +++ b/ipaserver/install/ipa_replica_prepare.py @@ -264,6 +264,14 @@ class ReplicaPrepare(admintool.AdminTool): options.reverse_zones = bindinstance.check_reverse_zones( options.ip_addresses, options.reverse_zones, options, False, True) + + host, zone = self.replica_fqdn.split('.', 1) + if not bindinstance.dns_zone_exists(zone, api=api): + self.log.error("DNS zone %s does not exist in IPA managed DNS " + "server. Either create DNS zone or omit " + "--ip-address option." % zone) + raise admintool.ScriptError("Cannot add DNS record") + if disconnect: api.Backend.ldap2.disconnect() @@ -481,11 +489,6 @@ class ReplicaPrepare(admintool.AdminTool): api.Backend.ldap2.connect( bind_dn=DN(('cn', 'Directory Manager')), bind_pw=self.dirman_password) - try: - add_zone(domain) - except errors.PublicError, e: - raise admintool.ScriptError( - "Could not create master DNS zone for the replica: %s" % e) for reverse_zone in options.reverse_zones: self.log.info("Adding reverse zone %s", reverse_zone) |