Merge e6121b4 into 3c630ca

reanahub · Jul 18, 2019 · 9a993b0 · 9a993b0
2 parents 3c630ca + e6121b4
commit 9a993b0
Showing 1 changed file with 21 additions and 15 deletions.
diff --git a/reana_workflow_controller/workflow_run_manager.py b/reana_workflow_controller/workflow_run_manager.py
@@ -194,7 +194,7 @@ class KubernetesWorkflowRunManager(WorkflowRunManager):
         'local': {
             'name': 'default-shared-volume',
             'hostPath': {
-                'path': SHARED_FS_MAPPING['MOUNT_SOURCE_PATH'],
+                'path': SHARED_FS_MAPPING['MOUNT_SOURCE_PATH']
             }
         }
     }
@@ -357,13 +357,7 @@ def _create_job_spec(self, name, command=None, image=None,
                 run_as_group=WORKFLOW_RUNTIME_USER_GID,
                 run_as_user=WORKFLOW_RUNTIME_USER_UID
             )
-        workflow_enginge_container.volume_mounts = [
-            {
-                'name': 'default-shared-volume',
-                'mountPath': SHARED_FS_MAPPING['MOUNT_DEST_PATH'],
-            }
-        ]
-
+        workflow_enginge_container.volume_mounts = self._get_volume_mounts()
         secrets_store = REANAUserSecretsStore(owner_id)
         user_secrets = secrets_store.get_secrets()
         file_secrets_items = []
@@ -421,17 +415,13 @@ def _create_job_spec(self, name, command=None, image=None,
         job_controller_container.env.extend(job_controller_env_vars)
         job_controller_container.env.extend(job_controller_env_secrets)
 
-        job_controller_container.volume_mounts = [
-            {
-                'name': 'default-shared-volume',
-                'mountPath': SHARED_FS_MAPPING['MOUNT_DEST_PATH'],
-            },
+        job_controller_container.volume_mounts = self._get_volume_mounts()
+        job_controller_container.volume_mounts.append(
             {
                 'name': owner_id,
                 'mountPath': "/etc/reana/secrets",
                 'readOnly': True
-            },
-        ]
+            })
         job_controller_container.ports = [{
             "containerPort":
                 current_app.config['JOB_CONTROLLER_CONTAINER_PORT']
@@ -474,3 +464,19 @@ def _create_job_controller_startup_cmd(self, user=None):
             return [full_cmd]
         else:
             return base_cmd.split()
+
+    def _get_volume_mounts(self):
+        """Return volume mounts."""
+        worksapce = self.workflow.get_workspace()
+        worksapce_mount = {
+            'name': 'default-shared-volume',
+            'mountPath':
+                SHARED_VOLUME_PATH + '/' + worksapce,
+            'subPath': worksapce
+        }
+        db_mount = {
+            'name': 'default-shared-volume',
+            'mountPath': SHARED_VOLUME_PATH + '/' + 'db',
+            'subPath': 'db'
+        }
+        return [worksapce_mount, db_mount]