diff options
| author | Lee Yarwood <lyarwood@redhat.com> | 2021-01-28 12:37:59 +0000 |
|---|---|---|
| committer | Lee Yarwood <lyarwood@redhat.com> | 2021-01-28 12:46:57 +0000 |
| commit | f9901ca92770a879a28c17f28814f6c93204f2fc (patch) | |
| tree | a00d1d594bf936611668d024cace443458c74fd9 /nova/image | |
| parent | b34a1ca645c61cd1dbbb53c9b0aa1f56915d9007 (diff) | |
| download | nova-f9901ca92770a879a28c17f28814f6c93204f2fc.tar.gz | |
glance: Remove [glance]/allowed_direct_url_schemes
This option was deprecated during Queens and can be removed now.
A single test is fully removed as it is no longer possible to hit the
usecase while an additional two tests are modified to test the recently
introduced rbd direct download usecase.
Change-Id: I5e8bbc078266d81d64c2073a828b6ff394e4f0e1
Diffstat (limited to 'nova/image')
| -rw-r--r-- | nova/image/glance.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/nova/image/glance.py b/nova/image/glance.py index 7060b7d966..870e1cd9a0 100644 --- a/nova/image/glance.py +++ b/nova/image/glance.py @@ -345,11 +345,7 @@ class GlanceImageServiceV2(object): """Calls out to Glance for data and writes data.""" # First, check if image could be directly downloaded by special handler - # TODO(stephenfin): Remove check for 'allowed_direct_url_schemes' when - # we clean up tests since it's not used elsewhere - if ((CONF.glance.allowed_direct_url_schemes or - self._download_handlers) and dst_path is not None - ): + if (self._download_handlers and dst_path is not None): image = self.show(context, image_id, include_locations=True) for entry in image.get('locations', []): loc_url = entry['url'] |