From f0487946cd760a97d92aac12d98cf8bb748576a2 Mon Sep 17 00:00:00 2001 From: Stanislav Laznicka Date: Fri, 26 Aug 2016 10:53:20 +0200 Subject: [PATCH] Don't ignore --ignore-last-of-role for last CA Use a handler created for the purpose of deciding whether to raise exception or not. https://fedorahosted.org/freeipa/ticket/6259 Reviewed-By: Oleg Fayans --- ipaserver/plugins/server.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ipaserver/plugins/server.py b/ipaserver/plugins/server.py index d62c0232c..a3d69a017 100644 --- a/ipaserver/plugins/server.py +++ b/ipaserver/plugins/server.py @@ -499,9 +499,10 @@ class server_del(LDAPDelete): 'ca_renewal_master_server', []) if ca_servers == [hostname]: - raise errors.ServerRemovalError( - reason=_("Deleting this server is not allowed as it would " - "leave your installation without a CA.")) + handler( + _("Deleting this server is not allowed as it would " + "leave your installation without a CA."), + ignore_last_of_role) if ca_renewal_master == hostname: other_cas = [ca for ca in ca_servers if ca != hostname]