Merge pull request #209 from cjellick/revert-volume-delete

Revert "Dont delete volumes when deleting container"

cattle/agent/handler.py

@@ -105,6 +105,8 @@ def _get_handler_category(self, req):
 class KindBasedMixin(object):
     CHECK_PATHS = [
         ["imageStoragePoolMap", "storagePool", "kind"],
+        ["volumeStoragePoolMap", "storagePool", "kind"],
+        ["snapshotStoragePoolMap", "storagePool", "kind"],
         ["instanceHostMap", "host", "kind"],
         ["instanceForceStop", "kind"],
         ["instanceInspect", "kind"],

cattle/plugins/docker/storage.py

@@ -5,6 +5,7 @@
 from contextlib import closing
 from cattle.type_manager import get_type, MARSHALLER
 from cattle.storage import BaseStoragePool
+from cattle.agent.handler import KindBasedMixin
 from cattle.plugins.docker.util import is_no_op, remove_container
 from cattle.lock import lock
 from cattle.progress import Progress
@@ -15,8 +16,9 @@
 log = logging.getLogger('docker')
 
 
-class DockerPool(BaseStoragePool):
+class DockerPool(KindBasedMixin, BaseStoragePool):
     def __init__(self):
+        KindBasedMixin.__init__(self, kind='docker')
         BaseStoragePool.__init__(self)
 
     @staticmethod
@@ -292,9 +294,6 @@ def volume_remove(self, req=None, volumeStoragePoolMap=None, **kw):
             data = self._get_response_data(req, volumeStoragePoolMap)
             return self._reply(req, data)
 
-    def _check_supports(self, req):
-        return True
-
 
 class ImageValidationError(Exception):
     pass

cattle/plugins/docker/util.py

@@ -64,7 +64,7 @@ def is_no_op(resource):
 
 def remove_container(client, container):
     try:
-        client.remove_container(container, force=True)
+        client.remove_container(container, force=True, v=True)
     except APIError as e:
         try:
             if e.response.status_code != 404: