Merge remote-tracking branch 'VJalili/CloudObjectStore' into dev

galaxyproject · Dec 12, 2017 · 9f0676d · 9f0676d
2 parents 7f30028 + 45ac767
commit 9f0676d
Show file tree

Hide file tree

Showing 6 changed files with 595 additions and 1 deletion.
diff --git a/config/object_store_conf.xml.sample b/config/object_store_conf.xml.sample
@@ -52,6 +52,16 @@
         </object_store>
         -->
 
+        <!-- Sample Cloud Object Store
+        <object_store type="cloud">
+            <auth access_key="..." secret_key="..." />
+            <bucket name="..." use_reduced_redundancy="False" />
+            <cache path="database/object_store_cache" size="1000" />
+            <extra_dir type="job_work" path="database/job_working_directory_s3"/>
+            <extra_dir type="temp" path="database/tmp_s3"/>
+        </object_store>
+        -->
+
 
     </backends>
 </object_store>
diff --git a/lib/galaxy/dependencies/__init__.py b/lib/galaxy/dependencies/__init__.py
@@ -112,6 +112,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
 

diff --git a/lib/galaxy/dependencies/conditional-requirements.txt b/lib/galaxy/dependencies/conditional-requirements.txt
@@ -13,6 +13,7 @@ graphitesend
 azure-storage==0.32.0
 # PyRods not in PyPI
 python-ldap==2.4.44
+cloudbridge==0.3.3
 
 # Chronos client
 chronos-python==0.38.0

diff --git a/lib/galaxy/dependencies/pinned-requirements.txt b/lib/galaxy/dependencies/pinned-requirements.txt
@@ -72,7 +72,7 @@ psutil==4.1.0
 pulsar-galaxy-lib==0.8.0
 
 # sqlalchemy-migrate and dependencies
-sqlalchemy-migrate==0.10.0
+sqlalchemy-migrate==0.11.0
 decorator==4.0.2
 Tempita==0.5.3dev
 sqlparse==0.1.16

diff --git a/lib/galaxy/objectstore/__init__.py b/lib/galaxy/objectstore/__init__.py
@@ -723,6 +723,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)