diff options
| author | Dan Smith <dansmith@redhat.com> | 2014-03-11 12:11:05 -0700 |
|---|---|---|
| committer | Dan Smith <dansmith@redhat.com> | 2014-03-12 08:27:20 -0700 |
| commit | 0ba9cca788309bd8763a0d277a907769604cd9f4 (patch) | |
| tree | a3acd49914f04e5812ffc2ca6d87642c9a629344 /nova/image | |
| parent | a7e018e8c76d6805dc0e857f24c64e3223224ae8 (diff) | |
| download | nova-0ba9cca788309bd8763a0d277a907769604cd9f4.tar.gz | |
Revert "Adding image multiple location support"
This reverts commit a55bbbfa1957d02b3006a51afcf4984a1f8ff886.
The series of patches involved with adding this feature introduced
an unexpected dependency on glance's v2 API, which we do not
currently support. Triggering a user-facing bug quickly, and leaving
some uncertainty about what else is likely to come in the future,
a revert of this code was decided given the short time to -rc1.
Closes-bug: 1291014
Change-Id: I2ed6a861e583b9513b0984ff9801d4b9f7536798
Diffstat (limited to 'nova/image')
| -rw-r--r-- | nova/image/glance.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/image/glance.py b/nova/image/glance.py index 7d703e95f2..0a9c18f995 100644 --- a/nova/image/glance.py +++ b/nova/image/glance.py @@ -292,7 +292,7 @@ class GlanceImageService(object): base_image_meta = self._translate_from_glance(image) return base_image_meta - def get_locations(self, context, image_id): + def _get_locations(self, context, image_id): """Returns the direct url representing the backend storage location, or None if this attribute is not shown by Glance. """ @@ -324,7 +324,7 @@ class GlanceImageService(object): def download(self, context, image_id, data=None, dst_path=None): """Calls out to Glance for data and writes data.""" if CONF.allowed_direct_url_schemes and dst_path is not None: - locations = self.get_locations(context, image_id) + locations = self._get_locations(context, image_id) for entry in locations: loc_url = entry['url'] loc_meta = entry['metadata'] |