From cf417db2e64a62a4c052a66204928936e90fd708 Mon Sep 17 00:00:00 2001 From: jichenjc Date: Wed, 16 Aug 2017 10:44:10 +0800 Subject: [PATCH] update comment for dropping support it's apparently too late to make this change in Pike rc stage so defer to Queens by changing the release version. Change-Id: I006f41383dcef68d63a646665a56cbd4c3f93c4b --- nova/virt/libvirt/volume/net.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nova/virt/libvirt/volume/net.py b/nova/virt/libvirt/volume/net.py index cec43ce93b..657edf8628 100644 --- a/nova/virt/libvirt/volume/net.py +++ b/nova/virt/libvirt/volume/net.py @@ -77,14 +77,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 - # 16.0.0 Pike release. + # 17.0.0 Queens release. # 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 16.0.0 Pike release.') + 'be dropped in the Nova 17.0.0 Queens release.') # use the nova config values conf.auth_username = CONF.libvirt.rbd_user conf.auth_secret_uuid = CONF.libvirt.rbd_secret_uuid