Merge "Do not include manila ceph key resource twice"
authorJenkins <jenkins@review.openstack.org>
Fri, 11 Aug 2017 12:41:46 +0000 (12:41 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 11 Aug 2017 12:41:46 +0000 (12:41 +0000)

Trivial merge