diff options
| author | Stanislav Laznicka <slaznick@redhat.com> | 2016-08-26 10:53:20 +0200 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-08-29 13:46:47 +0200 |
| commit | f0487946cd760a97d92aac12d98cf8bb748576a2 (patch) | |
| tree | 609a489723f11c7638479295133ea820bfff7403 /ipaserver/plugins/server.py | |
| parent | ec0a58e4845beeb14de747dbc841b5b3816a1595 (diff) | |
| download | freeipa-f0487946cd760a97d92aac12d98cf8bb748576a2.tar.gz freeipa-f0487946cd760a97d92aac12d98cf8bb748576a2.tar.xz freeipa-f0487946cd760a97d92aac12d98cf8bb748576a2.zip | |
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 <ofayans@redhat.com>
Diffstat (limited to 'ipaserver/plugins/server.py')
| -rw-r--r-- | ipaserver/plugins/server.py | 7 |
1 files 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] |