diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-09 03:27:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-09 03:27:42 +0000 |
| commit | bdd90e4ceabccf66163ca77f4cdbd965345b7002 (patch) | |
| tree | c7abcaa41ffbc19f9ae4f2959fc056c95e547412 /nova/api | |
| parent | 9026553e2f6af93fa8a15dbb9dd452f73d09ac1d (diff) | |
| parent | 2bcca3959209707e5604948ceb70d039671ae002 (diff) | |
| download | nova-bdd90e4ceabccf66163ca77f4cdbd965345b7002.tar.gz nova-bdd90e4ceabccf66163ca77f4cdbd965345b7002.tar.xz nova-bdd90e4ceabccf66163ca77f4cdbd965345b7002.zip | |
Merge "Move global glance opts into nova.image.glance"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/views/images.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/api/openstack/compute/views/images.py b/nova/api/openstack/compute/views/images.py index 13662c546..6438f0aa9 100644 --- a/nova/api/openstack/compute/views/images.py +++ b/nova/api/openstack/compute/views/images.py @@ -18,7 +18,7 @@ import os.path from nova.api.openstack import common -from nova import utils +from nova.image import glance class ViewBuilder(common.ViewBuilder): @@ -117,7 +117,7 @@ class ViewBuilder(common.ViewBuilder): def _get_alternate_link(self, request, identifier): """Create an alternate link for a specific image id.""" - glance_url = utils.generate_glance_url() + glance_url = glance.generate_glance_url() glance_url = self._update_glance_link_prefix(glance_url) return os.path.join(glance_url, request.environ["nova.context"].project_id, |