As of Ocata, cinder config is preferred for rbd auth values with a
fallback to nova values [1]. The fallback path, for the case when
rbd_user is configured in cinder.conf and rbd_secret_uuid is not
configured in cinder.conf, results in the mismatched use of cinder
rbd_user with nova rbd_secret_uuid.
This fixes that fallback path to use nova rbd_user from nova.conf
with rbd_secret_uuid from nova.conf.
[1] See commit f2d27f6a8afb62815fb6a885bd4f8ae4ed287fd3
Thanks to David Ames for this fix.
Change-Id: Ieba216275c07ab16414065ee47e66915e9e9477d
Co-Authored-By: David Ames <email address hidden>
Closes-Bug: #1809454
Reviewed: https:/ /review. openstack. org/626897 /git.openstack. org/cgit/ openstack/ nova/commit/ ?id=47b7c4f3cc5 82bf463fd0c796d f84736a0074f48
Committed: https:/
Submitter: Zuul
Branch: master
commit 47b7c4f3cc582bf 463fd0c796df847 36a0074f48
Author: Corey Bryant <email address hidden>
Date: Fri Dec 21 08:23:32 2018 -0500
Ensure rbd auth fallback uses matching credentials
As of Ocata, cinder config is preferred for rbd auth values with a
fallback to nova values [1]. The fallback path, for the case when
rbd_user is configured in cinder.conf and rbd_secret_uuid is not
configured in cinder.conf, results in the mismatched use of cinder
rbd_user with nova rbd_secret_uuid.
This fixes that fallback path to use nova rbd_user from nova.conf
with rbd_secret_uuid from nova.conf.
[1] See commit f2d27f6a8afb628 15fb6a885bd4f8a e4ed287fd3
Thanks to David Ames for this fix.
Change-Id: Ieba216275c07ab 16414065ee47e66 915e9e9477d
Co-Authored-By: David Ames <email address hidden>
Closes-Bug: #1809454