diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2013-01-07 22:06:49 +0000 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2013-01-08 10:23:40 +0000 |
| commit | 2bcca3959209707e5604948ceb70d039671ae002 (patch) | |
| tree | f1d3df4e8a24333251808c1fdd11f4865ba4273a /nova/api | |
| parent | 942b3ed874f045c892ad497ffadfdd80cb63bf9e (diff) | |
Move global glance opts into nova.image.glance
Move the glance_host, glance_port and glance_protocol options into the
nova.image.glance module.
Also move the generate_glance_url() and generate_image_url() utility
methods there since they're the only uses of the options outside of the
module.
blueprint: scope-config-opts
Change-Id: I3beca1a65cdd902a94ddc1c512d79a4de635ef38
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, |