From: Sage Weil <sage@newdream.net>
Date: Fri, 26 Mar 2021 12:19:06 +0000 (-0400)
Subject: Merge PR #40321 into master
X-Git-Tag: v17.1.0~2466
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7283a58f3dc33334991c32fec2dce9c9f77ded1b;p=ceph-ci.git

Merge PR #40321 into master

* refs/pull/40321/head:
	cephadm: fix parsing of keepalived version (drop leading 'v')
	cephadm: keepalived needs --cap-add=NET_RAW
	cephadm: fix --cap-add=NET_ADMIN
	cephadm: fix quoting for keepalived env var
	mgr/cephadm: ha-rgw: use correct port

Reviewed-by: Michael Fritch <mfritch@suse.com>
---

7283a58f3dc33334991c32fec2dce9c9f77ded1b