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
(cherry picked from commit 47b7c4f3cc582bf463fd0c796df84736a0074f48)
(cherry picked from commit f5d8ee1bfc3b7b9f1a25f85b42e207db0c9f4b04)
(cherry picked from commit accef50f9648dc40f1a6f457f83f5359e9dd2a24)
Reviewed: https:/ /review. openstack. org/627011 /git.openstack. org/cgit/ openstack/ nova/commit/ ?id=a7e25aa3d20 88e2726988c03e8 4b3b5ea47bfb7e
Committed: https:/
Submitter: Zuul
Branch: stable/pike
commit a7e25aa3d2088e2 726988c03e84b3b 5ea47bfb7e
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 463fd0c796df847 36a0074f48) f1a25f85b42e207 db0c9f4b04) 0f1a6f457f83f53 59e9dd2a24)
Co-Authored-By: David Ames <email address hidden>
Closes-Bug: #1809454
(cherry picked from commit 47b7c4f3cc582bf
(cherry picked from commit f5d8ee1bfc3b7b9
(cherry picked from commit accef50f9648dc4