[pve-devel] applied: [PATCH] check for ceph-mgr on destroymon

[Fabian Grünbichler]

to stable-4

On Mon, Aug 14, 2017 at 02:53:45PM +0200, Alwin Antreich wrote:
> Signed-off-by: Alwin Antreich <a.antreich at proxmox.com>
> ---
>  PVE/API2/Ceph.pm | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/PVE/API2/Ceph.pm b/PVE/API2/Ceph.pm
> index 71ea687f..6424f02f 100644
> --- a/PVE/API2/Ceph.pm
> +++ b/PVE/API2/Ceph.pm
> @@ -1087,7 +1087,7 @@ __PACKAGE__->register_method ({
>  	    File::Path::remove_tree($mondir);
>  
>  	    # remove manager
> -	    if (!$param->{'exclude-manager'}) {
> +	    if (!$param->{'exclude-manager'} && PVE::CephTools::check_ceph_mgr_installed(1)) {
>  		eval { $destroy_mgr->($monid); };
>  		warn $@ if $@;
>  	    }
> -- 
> 2.11.0
> 
> 
> _______________________________________________
> pve-devel mailing list
> pve-devel at pve.proxmox.com
> https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel