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/utils.py | |
| 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/utils.py')
| -rw-r--r-- | nova/utils.py | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/nova/utils.py b/nova/utils.py index b9e8e239c..20c291382 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -80,9 +80,6 @@ utils_opts = [ CONF = cfg.CONF CONF.register_opts(monkey_patch_opts) CONF.register_opts(utils_opts) -CONF.import_opt('glance_host', 'nova.config') -CONF.import_opt('glance_port', 'nova.config') -CONF.import_opt('glance_protocol', 'nova.config') CONF.import_opt('service_down_time', 'nova.config') LOG = logging.getLogger(__name__) @@ -975,17 +972,6 @@ def timefunc(func): return inner -def generate_glance_url(): - """Generate the URL to glance.""" - return "%s://%s:%d" % (CONF.glance_protocol, CONF.glance_host, - CONF.glance_port) - - -def generate_image_url(image_ref): - """Generate an image URL from an image_ref.""" - return "%s/images/%s" % (generate_glance_url(), image_ref) - - @contextlib.contextmanager def remove_path_on_error(path): """Protect code that wants to operate on PATH atomically. |