From 1c8af3b1cbc8088c8cc3a3dbbe3593cad9e41403 Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcritten@redhat.com>
Date: Tue, 29 Mar 2011 13:27:11 -0400
Subject: [PATCH] Make retrieval of the CA during DNS discovery non-fatal.

ticket 1135
---
 ipa-client/ipaclient/ipadiscovery.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ipa-client/ipaclient/ipadiscovery.py b/ipa-client/ipaclient/ipadiscovery.py
index e7c5830..0df23eb 100644
--- a/ipa-client/ipaclient/ipadiscovery.py
+++ b/ipa-client/ipaclient/ipadiscovery.py
@@ -185,7 +185,8 @@ class IPADiscovery:
         try:
             run(["/usr/bin/wget", "-O", "%s/ca.crt" % temp_ca_dir, "http://%s/ipa/config/ca.crt" % thost])
         except CalledProcessError, e:
-            raise RuntimeError('Retrieving CA from %s failed.\n%s' % (thost, str(e)))
+            logging.debug('Retrieving CA from %s failed.\n%s' % (thost, str(e)))
+            return []
 
         #now verify the server is really an IPA server
         try:
-- 
1.7.4

