openstack/nova
Code Issues Proposed changes

libvirt: generalize rbd volume fallback removal statement

Browse Source 
The warning being modified here was added in Pike:

  I6fc7108817fcd9df4a342c9dabbf14ab7911d06a

And then updated to say we would remove the fallback in
Queens:

  I006f41383dcef68d63a646665a56cbd4c3f93c4b

And here we're long past Queens and still have this old
warning with no immediate plans to do data migrations to
drop the fallback code, so this change simply makes the
warning message more generic.

Change-Id: Icdc02d0bbd023e916bd39945fe7afc52b7a3942c
This commit is contained in:
Matt Riedemann 2018-12-21 17:07:49 -05:00
parent 47b7c4f3cc
commit 24fa4a5e20
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