Merge 072501f into b631360

docs/gettingstarted.rst

@@ -173,21 +173,58 @@ Deploy on CERN infrastructure
 
       (reana) $ pip install reana-cluster
 
-9. Instantiate REANA cluster using CEPHFS:
+9. Create your own ``reana-cluster.yaml``. For instance, to deploy REANA
+   ``0.5.0`` at CERN with 200 GB Ceph volume and having as URL
+   ``reana-dev.cern.ch`` the file, ``reana-cluster-CERN.yaml``, would look
+   like follows:
+
+   .. code-block:: yaml
+
+      cluster:
+        type: "kubernetes"
+        version: "v1.14.0"
+        db_config: &db_base_config
+         - REANA_SQLALCHEMY_DATABASE_URI: "postgresql+psycopg2://reana:reana@db:5432/reana"
+        root_path: "/var/reana"
+        shared_volume_path: "/var/reana"
+        reana_url: "reana-dev.cern.ch"
+        cephfs_volume_size: 200
+        db_persistence_path: "/var/reana/db"
+
+      components:
+        reana-workflow-controller:
+          type: "docker"
+          image: "reanahub/reana-workflow-controller:0.5.0"
+          environment:
+           - <<: *db_base_config
+           - ORGANIZATIONS: "default,alice,atlas,cms,lhcb"
+           - REANA_WORKFLOW_ENGINE_IMAGE_CWL: "reanahub/reana-workflow-engine-cwl:0.5.0"
+           - REANA_WORKFLOW_ENGINE_IMAGE_YADAGE: "reanahub/reana-workflow-engine-yadage:0.5.0"
+           - REANA_WORKFLOW_ENGINE_IMAGE_SERIAL: "reanahub/reana-workflow-engine-serial:0.5.0"
+
+        reana-server:
+          type: "docker"
+          image: "reanahub/reana-server:0.5.0"
+          environment:
+           - <<: *db_base_config
+
+        reana-message-broker:
+          type: "docker"
+          image: "reanahub/reana-message-broker:0.5.0"
+
+
+9. Instantiate REANA cluster:
 
    .. code-block:: console
 
-      (reana) $ reana-cluster -f reana-cluster.yaml \
-                              --cephfs
-                              --cephfs-volume-size <size in GB>
-                              --url <reana-instance-url>
-                              init
+      (reana) $ reana-cluster -f reana-cluster-CERN.yaml --cephfs init
+
 
-10. Test that REANA can be accessed by its domain name:
+10. Test that REANA can be accessed by the specified domain name:
 
    .. code-block:: console
 
-      (reana) $ curl http://reana.cern.ch/api/ping
+      (reana) $ curl http://reana-dev.cern.ch/api/ping
       {"message": "OK", "status": "200"}
 
 

docs/userguide.rst

@@ -157,15 +157,15 @@ working REANA cluster, ready to run workflows that users submit via
 In order to achieve this, ``reana-cluster`` needs to know how the REANA cluster
 should be set up; e.g. what versions of REANA components should be deployed and
 how the configuration of each component should be set up. ``reana-cluster``
-expects to get this information via ``reana-cluster.yaml`` file that comes with
+expects to get this information via ``reana-cluster-stable.yaml`` file that comes with
 the package:
 
-.. literalinclude:: ../reana_cluster/configurations/reana-cluster.yaml
+.. literalinclude:: ../reana_cluster/configurations/reana-cluster-stable.yaml
    :language: yaml
 
-You can use the supplied ``reana-cluster.yaml``, or create your own custom
+You can use the supplied ``reana-cluster-stable.yaml``, or create your own custom
 configuration. For instance, if you wish to use a different Docker image for the
-``reana-server`` component, you can copy the default ``reana-cluster.yaml`` to a
+``reana-server`` component, you can copy the default ``reana-cluster-stable.yaml`` to a
 ``reana-cluster-custom.yaml`` file and change the image tag
 ``reanahub/reana-server:0.2.0`` according to your wishes.
 

reana_cluster/backends/kubernetes/k8s.py

@@ -83,7 +83,7 @@ def __init__(self,
         logging.debug('Creating a ReanaBackend object '
                       'for Kubernetes interaction.')
 
-        # Load Kubernetes cluster configuration. If reana-cluster.yaml
+        # Load Kubernetes cluster configuration. If reana-cluster-stable.yaml
         # doesn't specify this K8S Python API defaults to '$HOME/.kube/config'
         self.kubeconfig = kubeconfig or \
             cluster_spec['cluster'].get('config', None)

reana_cluster/config.py

@@ -12,7 +12,7 @@
 from .backends.kubernetes import KubernetesBackend
 
 cluster_spec_default_file_path = pkg_resources.resource_filename(
-    'reana_cluster', 'configurations/reana-cluster.yaml')
+    'reana_cluster', 'configurations/reana-cluster-minikube.yaml')
 """REANA cluster specification file default location."""
 
 generated_cluster_conf_default_path = './cluster_config/'

reana_cluster/configurations/reana-cluster-dev.yaml → reana_cluster/configurations/reana-cluster-minikube-dev.yaml

@@ -1,12 +1,5 @@
 cluster:
   type: "kubernetes"
-  # Can be used to specify kubeconfig configuration that reana-cluster will
-  # use to connecting to K8S cluster. If not specified, will default to
-  # '$HOME/.kube/config', which is default location of `kubectl` tool.
-  # config: "./development-kubeconfig.yaml"
-
-  # Specifies which K8S context from the kubeconfig configuration will be used.
-  # If not specified will use the value of `current-context:` key of kubeconfig.
   version: "v1.14.0"
   db_config: &db_base_config
     - REANA_SQLALCHEMY_DATABASE_URI: "postgresql+psycopg2://reana:reana@db:5432/reana"