Cloud ObjectStore

lib/galaxy/dependencies/__init__.py

@@ -109,6 +109,9 @@ def check_python_ldap( self ):
     def check_azure_storage( self ):
         return 'azure_blob' in self.object_stores
 
+    def check_cloudbridge( self ):
+        return 'cloud' in self.object_stores
+
     def check_kamaki(self):
         return 'pithos' in self.object_stores
 

lib/galaxy/dependencies/conditional-requirements.txt

@@ -13,6 +13,7 @@ graphitesend
 azure-storage==0.32.0
 # PyRods not in PyPI
 python-ldap==2.4.27
+cloudbridge==0.3.1
 
 # Synnefo / Pithos+ object store client
 kamaki

lib/galaxy/objectstore/__init__.py

@@ -722,6 +722,9 @@ def build_object_store_from_config(config, fsmon=False, config_xml=None):
     elif store == 's3':
         from .s3 import S3ObjectStore
         return S3ObjectStore(config=config, config_xml=config_xml)
+    elif store == 'cloud':
+        from .cloud import Cloud
+        return Cloud(config=config, config_xml=config_xml)
     elif store == 'swift':
         from .s3 import SwiftObjectStore
         return SwiftObjectStore(config=config, config_xml=config_xml)