From 2e974ebf99737504f01feb2cbb85d3acbc2a15d6 Mon Sep 17 00:00:00 2001

From: Martin Basti <mbasti@redhat.com>

Date: Tue, 18 Nov 2014 18:30:59 +0100

Subject: [PATCH] Show warning instead of error if CA did not start

This is just workaround, checking if CA is working raises false positive

exception during upgrade

Ticket: https://fedorahosted.org/freeipa/ticket/4676

Reviewed-By: Simo Sorce <ssorce@redhat.com>

---

 install/tools/ipa-upgradeconfig | 4 ++++

 1 file changed, 4 insertions(+)

diff --git a/install/tools/ipa-upgradeconfig b/install/tools/ipa-upgradeconfig

index 6556d8f313d3a9efeb32d4cba97cb82796459652..3484f8e8768fe05dddb08e9a40e58d8ad9c2e1e7 100644

--- a/install/tools/ipa-upgradeconfig

+++ b/install/tools/ipa-upgradeconfig

@@ -1457,6 +1457,10 @@ def main():

             ca.restart(dogtag.configured_constants().PKI_INSTANCE_NAME)

         except ipautil.CalledProcessError, e:

             root_logger.error("Failed to restart %s: %s", ca.service_name, e)

+        # FIXME https://fedorahosted.org/freeipa/ticket/4676

+        # workaround

+        except RuntimeError as e:

+            root_logger.warning(str(e))

     set_sssd_domain_option('ipa_server_mode', 'True')

-- 

2.1.0