diff options
| author | Martin Kosek <mkosek@redhat.com> | 2013-05-09 17:50:15 +0200 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2013-05-09 14:16:51 -0400 |
| commit | 8667d169daece75794c5dcf8b42d22c9a41840a1 (patch) | |
| tree | 1e6df954f18ad29b9a93c33989e91fede98e5762 | |
| parent | 6368a60730097311510c0e1258790d916782e6d4 (diff) | |
| download | freeipa-8667d169daece75794c5dcf8b42d22c9a41840a1.tar.gz freeipa-8667d169daece75794c5dcf8b42d22c9a41840a1.tar.xz freeipa-8667d169daece75794c5dcf8b42d22c9a41840a1.zip | |
Fix ipa-ca DNS name creation
Previous fix (6d06a7e) did not work properly on a CA-less replica
with CA-powered master.
https://fedorahosted.org/freeipa/ticket/3617
| -rw-r--r-- | ipaserver/install/bindinstance.py | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py index 5a2450e61..ac86e9e7d 100644 --- a/ipaserver/install/bindinstance.py +++ b/ipaserver/install/bindinstance.py @@ -733,13 +733,17 @@ class BindInstance(service.Service): self.__add_ipa_ca_records(self.fqdn, [self.ip_address], self.ca_configured) - if self.first_instance and self.ca_configured: + if self.first_instance: ldap = api.Backend.ldap2 - entries = ldap.get_entries( - DN(('cn', 'masters'), ('cn', 'ipa'), ('cn', 'etc'), - api.env.basedn), - ldap.SCOPE_SUBTREE, '(&(objectClass=ipaConfigObject)(cn=CA))', - ['dn']) + try: + entries = ldap.get_entries( + DN(('cn', 'masters'), ('cn', 'ipa'), ('cn', 'etc'), + api.env.basedn), + ldap.SCOPE_SUBTREE, '(&(objectClass=ipaConfigObject)(cn=CA))', + ['dn']) + except errors.NotFound: + root_logger.debug('No server with CA found') + entries = [] for entry in entries: fqdn = entry.dn[1]['cn'] |