{"body":"diff --git a/cinder/api/contrib/volume_actions.py b/cinder/api/contrib/volume_actions.py\nindex 71123bf..dab7f53 100644\n--- a/cinder/api/contrib/volume_actions.py\n+++ b/cinder/api/contrib/volume_actions.py\n@@ -75,6 +75,18 @@ class VolumeActionsController(wsgi.Controller):\n         super(VolumeActionsController, self).__init__(*args, **kwargs)\n         self.volume_api = volume.API()\n \n+    @wsgi.Controller.api_version(\"2.0\", \"2.1\")\n+    def _attach_volume(self, req, context, volume, instance_uuid, host_name,\n+                       mountpoint, mode):\n+        self.volume_api.attach(context, volume, instance_uuid, host_name,\n+                               mountpoint, mode, no_locks=False)\n+\n+    @wsgi.Controller.api_version(\"2.2\")\n+    def _attach_volume(self, req, context, volume, instance_uuid, host_name,\n+                       mountpoint, mode):\n+        self.volume_api.attach(context, volume, instance_uuid, host_name,\n+                               mountpoint, mode, no_locks=True)\n+\n     @wsgi.action('os-attach')\n     def _attach(self, req, id, body):\n         \"\"\"Add attachment metadata.\"\"\"\n@@ -115,9 +127,10 @@ class VolumeActionsController(wsgi.Controller):\n                     \"Attaching mode should be 'rw' or 'ro'\")\n             raise webob.exc.HTTPBadRequest(explanation=msg)\n         try:\n-            self.volume_api.attach(context, volume,\n-                                   instance_uuid, host_name, mountpoint, mode)\n+            self._attach_volume(req, context, volume, instance_uuid, host_name,\n+                                mountpoint, mode):\n","name":"patch that breaks wsgi.os-actions","extension":"txt","url":"https://www.irccloud.com/pastebin/1iJcMF5N/patch+that+breaks+wsgi.os-actions","modified":1444161952,"id":"1iJcMF5N","size":1584,"lines":31,"own_paste":false,"theme":"","date":1444161952}