diff --git a/cinder/image/cache.py b/cinder/image/cache.py index 54a5b2b0d70..ef765f1d53a 100644 --- a/cinder/image/cache.py +++ b/cinder/image/cache.py @@ -196,9 +196,6 @@ class ImageVolumeCache(object): # Delete will evict the cache entry. self.volume_api.delete(context, volume_ref) - def _get_image_volume_name(self, image_id): - return 'image-volume-' + image_id - def _should_update_entry(self, cache_entry, image_meta): """Ensure that the cache entry image data is still valid.""" image_updated_utc = (image_meta['updated_at'] diff --git a/cinder/image/glance.py b/cinder/image/glance.py index 13e873d4027..b2929918585 100644 --- a/cinder/image/glance.py +++ b/cinder/image/glance.py @@ -319,16 +319,6 @@ class GlanceImageService(object): except Exception: _reraise_translated_image_exception(image_id) - def delete_locations(self, context, image_id, url_set): - """Delete backend location urls from an image.""" - if CONF.glance_api_version != 2: - raise exception.Invalid("Image API version 2 is disabled.") - client = GlanceClientWrapper(version=2) - try: - return client.call(context, 'delete_locations', image_id, url_set) - except Exception: - _reraise_translated_image_exception(image_id) - def download(self, context, image_id, data=None): """Calls out to Glance for data and writes data.""" if data and 'file' in CONF.allowed_direct_url_schemes: diff --git a/cinder/manager.py b/cinder/manager.py index d725dc6ed22..0195b7fb8bc 100644 --- a/cinder/manager.py +++ b/cinder/manager.py @@ -61,7 +61,6 @@ from cinder.db import base from cinder.i18n import _LI from cinder import rpc from cinder.scheduler import rpcapi as scheduler_rpcapi -from cinder import version from eventlet import greenpool @@ -112,15 +111,6 @@ class Manager(base.Base, PeriodicTasks): """ pass - def service_version(self): - return version.version_string() - - def service_config(self): - config = {} - for key in CONF: - config[key] = CONF.get(key, None) - return config - def is_working(self): """Method indicating if service is working correctly.