From b428e25faf9c8c63fe37fc7ee19a99feaf0da12a Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Wed, 22 Aug 2018 14:18:01 -0500 Subject: [PATCH] Remove WindowsDriver mapping The WindowsDriver was renamed to WindowsISCSIDriver in change I3877491463dce3d46f7ac0e194ffdf46a0e7c84c to avoid confusion with the Windows SMB driver. It has now been two release cycles and the backward compatibility mapping can now be removed. Change-Id: I602cccac73b6dc8d0b0824a5dffb0373c151452e Signed-off-by: Sean McGinnis --- cinder/volume/manager.py | 6 ++++-- .../notes/remove-windows-mapping-51a004f466470a2b.yaml | 9 +++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/remove-windows-mapping-51a004f466470a2b.yaml diff --git a/cinder/volume/manager.py b/cinder/volume/manager.py index 1d1301dbe15..570a40bea8e 100644 --- a/cinder/volume/manager.py +++ b/cinder/volume/manager.py @@ -155,9 +155,11 @@ CONF = cfg.CONF CONF.register_opts(volume_manager_opts) CONF.register_opts(volume_backend_opts, group=config.SHARED_CONF_GROUP) +# MAPPING is used for driver renames to keep backwards compatibilty. When a +# driver is renamed, add a mapping here from the old name (the dict key) to the +# new name (the dict value) for at least a cycle to allow time for deployments +# to transition. MAPPING = { - 'cinder.volume.drivers.windows.windows.WindowsDriver': - 'cinder.volume.drivers.windows.iscsi.WindowsISCSIDriver', } diff --git a/releasenotes/notes/remove-windows-mapping-51a004f466470a2b.yaml b/releasenotes/notes/remove-windows-mapping-51a004f466470a2b.yaml new file mode 100644 index 00000000000..d128effe488 --- /dev/null +++ b/releasenotes/notes/remove-windows-mapping-51a004f466470a2b.yaml @@ -0,0 +1,9 @@ +--- +upgrade: + - | + The ``WindowsDriver`` was renamed in the Queens release to + ``WindowsISCSIDriver`` to avoid confusion with the SMB driver. The + backwards compatibility for this has now been removed, so any cinder.conf + settings still using + ``cinder.volume.drivers.windows.windows.WindowsDriver`` must now be updated + to use ``cinder.volume.drivers.windows.iscsi.WindowsISCSIDriver``.