From: caolei <cao.leilc@inspur.com>
Date: Fri, 18 Jun 2021 00:55:13 +0000 (+0800)
Subject: Merge branch 'master' into wip-del-tenant-parse-in-createrole
X-Git-Tag: v17.1.0~1338^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c08c75dfa138ea5334dd5a28393c0c2480b7515a;p=ceph-ci.git

Merge branch 'master' into wip-del-tenant-parse-in-createrole
---

c08c75dfa138ea5334dd5a28393c0c2480b7515a