Merge "Remove dead reserve_volume compat code in _validate_bdm"

2019-10-20 00:38:24 +00:00
parent c323178536 56d3f4657c
commit e2edf7b2d0
1 changed files with 0 additions and 7 deletions
@@ -1618,13 +1618,6 @@ class API(base.Base):
                    self._check_attach_and_reserve_volume(
                        context, volume, instance, bdm, supports_multiattach)
                    bdm.volume_size = volume.get('size')
-
-                    # NOTE(mnaser): If we end up reserving the volume, it will
-                    #               not have an attachment_id which is needed
-                    #               for cleanups.  This can be removed once
-                    #               all calls to reserve_volume are gone.
-                    if 'attachment_id' not in bdm:
-                        bdm.attachment_id = None
                except (exception.CinderConnectionFailed,
                        exception.InvalidVolume,
                        exception.MultiattachNotSupportedOldMicroversion):