From: Sage Weil <sage@newdream.net>
Date: Wed, 5 May 2021 15:57:28 +0000 (-0400)
Subject: Merge PR #41149 into master
X-Git-Tag: v17.1.0~2068
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b011cc486b0a7ad2b2fb93376e974d357a7881f8;p=ceph.git

Merge PR #41149 into master

* refs/pull/41149/head:
	mgr/cephadm: remove haproxy+keepalived container image from service spec

Reviewed-by: Adam King <adking@redhat.com>
---

b011cc486b0a7ad2b2fb93376e974d357a7881f8