forked from openstack/kolla-ansible
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
In Ussuri, nova stopped using separate Ceph keys for the volumes and vms pools by default. Instead, we set ceph_nova_keyring to the value of ceph_cinder_keyring by default, which is ceph.client.cinder.keyring. This is in line with the Ceph OpenStack integration guide [1]. However, the user used by nova to access the vms pool (ceph_nova_user) defaults to nova, meaning that nova will still try to use a ceph.client.nova.keyring, which probably does not exist. We did not see this issue in CI, because we set ceph_nova_user to cinder. This change fixes the issue by setting ceph_nova_user to the value of ceph_cinder_user by default, which is cinder. Closes-Bug: #1934145 Related-Bug: #1928690 [1] https://docs.ceph.com/en/latest/rbd/rbd-openstack/ Change-Id: I6aa8db2214e07906f1f3e035411fc80ba911a274
- Loading branch information
1 parent
a73e89f
commit c3f9ba8
Showing
3 changed files
with
23 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
--- | ||
fixes: | ||
- | | ||
Fixes an issue with default Nova configuration for Ceph where the RBD user | ||
is set to ``nova``, but only a ``cinder`` keyring is copied. The default | ||
value of ``ceph_nova_user`` is changed to the value of | ||
``ceph_cinder_user``, in line with the default for ``ceph_nova_keyring``. | ||
`LP#1934145 <https://bugs.launchpad.net/kolla-ansible/+bug/1934145>`__ | ||
upgrade: | ||
- | | ||
Modifies the default value of ``ceph_nova_user`` from ``nova`` to | ||
the value of ``ceph_cinder_user``, in line with the default for | ||
``ceph_nova_keyring``. Users who have overridden ``ceph_nova_keyring`` to | ||
use separate keyrings for Nova and Cinder should also override | ||
``ceph_nova_user`` to match the Nova keyring. `LP#1934145 | ||
<https://bugs.launchpad.net/kolla-ansible/+bug/1934145>`__ |