Remove unused check_snapshots_enabled

Only used in Nova by the createImage action.

Change-Id: I114281fd553020ac96c499c18ff3e4a2a626c3b2

diff --git a/cinder/api/openstack/common.py b/cinder/api/openstack/common.py
index 0ebe610e0600e63424e760a97deff06e7f2cbde2..de0a6a5a70a291f36d4675c3dcb221ab800cacdf 100644 (file)
--- a/cinder/api/openstack/common.py
+++ b/cinder/api/openstack/common.py
@@ -178,18 +178,6 @@ def dict_to_query_str(params):
     return param_str.rstrip('&')
 
 
-def check_snapshots_enabled(f):
-    @functools.wraps(f)
-    def inner(*args, **kwargs):
-        if not FLAGS.allow_instance_snapshots:
-            LOG.warn(_('Rejecting snapshot request, snapshots currently'
-                       ' disabled'))
-            msg = _("Instance snapshots are not permitted at this time.")
-            raise webob.exc.HTTPBadRequest(explanation=msg)
-        return f(*args, **kwargs)
-    return inner
-
-
 class ViewBuilder(object):
     """Model API responses as dictionaries."""
 

diff --git a/etc/cinder/cinder.conf.sample b/etc/cinder/cinder.conf.sample
index e28bec3d15fbf7844c386aabe6ab3c5424c735ff..3dba756d12641ec863a55ce7ae5e7ef893a101a9 100644 (file)
--- a/etc/cinder/cinder.conf.sample
+++ b/etc/cinder/cinder.conf.sample
@@ -440,11 +440,6 @@
 ###### (IntOpt) Number of minutes for lockout window.
 # lockout_window=15
 
-######### defined in cinder.api.openstack.compute #########
-
-###### (BoolOpt) Permit instance snapshot operations.
-# allow_instance_snapshots=true
-
 ######### defined in cinder.ipv6.api #########
 
 ###### (StrOpt) Backend to use for IPv6 generation