openstack
/
nova
Code Issues Proposed changes

Merge "libvirt: generalize rbd volume fallback removal statement"

This commit is contained in:
Zuul 2018-12-25 03:28:40 +00:00 committed by Gerrit Code Review
parent 9b0019b5a9 24fa4a5e20
commit 0156d6d07d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nova/virt/libvirt/volume/net.py
View File

@ -80,14 +80,14 @@ class LibvirtNetVolumeDriver(libvirt_volume.LibvirtBaseVolumeDriver):
elif CONF.libvirt.rbd_secret_uuid:
# Anyone relying on falling back to nova config is probably having
# this work accidentally and we'll remove that support in the
# 17.0.0 Queens release.
# future.
# NOTE(mriedem): We'll have to be extra careful about this in case
# the reason we got here is due to an old volume connection created
# before we started preferring the Cinder settings in Ocata.
LOG.warning('Falling back to Nova configuration values for '
'RBD authentication. Cinder should be configured '
'for auth with Ceph volumes. This fallback will '
'be dropped in the Nova 17.0.0 Queens release.')
'be dropped in a future release.')
# use the nova config values
conf.auth_username = CONF.libvirt.rbd_user
conf.auth_secret_uuid = CONF.libvirt.rbd_secret_uuid