diff --git a/content/en/users/compute/orchestration/_index.md b/content/en/users/compute/orchestration/_index.md index 4b65659c6f..f007873c5a 100644 --- a/content/en/users/compute/orchestration/_index.md +++ b/content/en/users/compute/orchestration/_index.md @@ -21,8 +21,6 @@ choose (or gets used automatically) in specific scenarios: | Service Name | Workload Type | Use-Case | | ------------------------------------------- | ---------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- | | [Infrastructure Manager](im) | VMs, containers, storage | Used to run workloads on a single IaaS Cloud provider. | -| [Elastic Cloud Compute Cluster](ec3) | VMs, containers, storage | Used when you need to run workloads on clusters that can be elastically scaled and potentially span more than one IaaS Cloud provider. | | [Workload Manager](workload-manager) | Jobs | Used to efficiently distribute, manage, and monitor computing workloads. | -| [Dynamic On-Demand Analysis Service](dodas) | Containers, storage (caches) | Used when you need to process your data either interactively or via a batch system. | The following sections offer more details about each of these orchestrators. diff --git a/content/en/users/compute/orchestration/dodas/_index.md b/content/en/users/compute/orchestration/dodas/_index.md deleted file mode 100644 index 4e9be014dd..0000000000 --- a/content/en/users/compute/orchestration/dodas/_index.md +++ /dev/null @@ -1,38 +0,0 @@ ---- -title: Dynamic On-Demand Analysis Software -linkTitle: Dynamic On-Demand Analysis Software -type: docs -weight: 40 -description: > - Instantiate on-demand customizable infrastructures for data analysis ---- - -## What is it? - -[Dynamic On-Demand Analysis Software (DODAS)](https://dodas-iam.cloud.cnaf.infn.it/login) -enables the execution of user analysis code both in batch mode and -interactively via the Jupyter interface. DODAS is highly customizable and offers -several building blocks that can be combined together in order to create the -best service composition for a given use case. The currently available blocks -allow to combine Jupyter and HTCondor as well as Jupyter and Spark or simply a -jupyter interface. In addition, they allow the management of data via caches to -optimize the processing of remote data. This can be done either via XCache or -MinIO S3 object storage capabilities. DODAS is based on docker containers and -the related orchestration relies on Kubernetes that enables the possibility to -compose the building blocks via a web-based user interface thanks to Kubeapps. - -In order to deploy it services over various backend, DODAS relies on -[Infrastructure Manager](../im) and -[INDIGO PaaS](https://indigo-paas.cloud.ba.infn.it/home/login) - -{{% alert title="Tip" color="info" %}} If you want to give it a try and deploy -your cluster in the EGI Federation: -[DODAS](https://dodas-iam.cloud.cnaf.infn.it/login). {{% /alert %}} - -{{% alert title="Note" color="info" %}} For detailed information about DODAS -please see its [documentation](https://web.infn.it/dodas/index.php/en/). It was -also presented in one of the [EGI Webinars](https://www.egi.eu/trainings-and-webinars/), more -details are available on the [indico page](https://indico.egi.eu/event/5695/) -and the video recording is available on -[YouTube](https://www.youtube.com/watch?v=bcURl4ESRW8&ab_channel=EGI). -{{% /alert %}} diff --git a/content/en/users/compute/orchestration/ec3/_index.md b/content/en/users/compute/orchestration/im/ec3/_index.md similarity index 100% rename from content/en/users/compute/orchestration/ec3/_index.md rename to content/en/users/compute/orchestration/im/ec3/_index.md diff --git a/content/en/users/compute/orchestration/ec3/apps/_index.md b/content/en/users/compute/orchestration/im/ec3/apps/_index.md similarity index 97% rename from content/en/users/compute/orchestration/ec3/apps/_index.md rename to content/en/users/compute/orchestration/im/ec3/apps/_index.md index dc719bbb9f..d5ec6a2842 100644 --- a/content/en/users/compute/orchestration/ec3/apps/_index.md +++ b/content/en/users/compute/orchestration/im/ec3/apps/_index.md @@ -29,7 +29,7 @@ Check the dedicated [ECAS documentation](./ecas/). ### Kubernetes Check the -[Cloud Container Compute documentation](../../../cloud-container-compute). +[Cloud Container Compute documentation](../../../../cloud-container-compute). ### Mesos + Marathon + Chronos diff --git a/content/en/users/compute/orchestration/ec3/apps/ecas/_index.md b/content/en/users/compute/orchestration/im/ec3/apps/ecas/_index.md similarity index 100% rename from content/en/users/compute/orchestration/ec3/apps/ecas/_index.md rename to content/en/users/compute/orchestration/im/ec3/apps/ecas/_index.md diff --git a/content/en/users/compute/orchestration/ec3/apps/ecas/ecas-application-dashboard.png b/content/en/users/compute/orchestration/im/ec3/apps/ecas/ecas-application-dashboard.png similarity index 100% rename from content/en/users/compute/orchestration/ec3/apps/ecas/ecas-application-dashboard.png rename to content/en/users/compute/orchestration/im/ec3/apps/ecas/ecas-application-dashboard.png diff --git a/content/en/users/compute/orchestration/ec3/apps/ecas/ecas-container-1.png b/content/en/users/compute/orchestration/im/ec3/apps/ecas/ecas-container-1.png similarity index 100% rename from content/en/users/compute/orchestration/ec3/apps/ecas/ecas-container-1.png rename to content/en/users/compute/orchestration/im/ec3/apps/ecas/ecas-container-1.png diff --git a/content/en/users/compute/orchestration/ec3/apps/ecas/ecas-container-2.png b/content/en/users/compute/orchestration/im/ec3/apps/ecas/ecas-container-2.png similarity index 100% rename from content/en/users/compute/orchestration/ec3/apps/ecas/ecas-container-2.png rename to content/en/users/compute/orchestration/im/ec3/apps/ecas/ecas-container-2.png diff --git a/content/en/users/compute/orchestration/ec3/apps/ecas/ecas-end.png b/content/en/users/compute/orchestration/im/ec3/apps/ecas/ecas-end.png similarity index 100% rename from content/en/users/compute/orchestration/ec3/apps/ecas/ecas-end.png rename to content/en/users/compute/orchestration/im/ec3/apps/ecas/ecas-end.png diff --git a/content/en/users/compute/orchestration/ec3/apps/ecas/ecas-endpoint.png b/content/en/users/compute/orchestration/im/ec3/apps/ecas/ecas-endpoint.png similarity index 100% rename from content/en/users/compute/orchestration/ec3/apps/ecas/ecas-endpoint.png rename to content/en/users/compute/orchestration/im/ec3/apps/ecas/ecas-endpoint.png diff --git a/content/en/users/compute/orchestration/ec3/apps/ecas/ecas-explore.png b/content/en/users/compute/orchestration/im/ec3/apps/ecas/ecas-explore.png similarity index 100% rename from content/en/users/compute/orchestration/ec3/apps/ecas/ecas-explore.png rename to content/en/users/compute/orchestration/im/ec3/apps/ecas/ecas-explore.png diff --git a/content/en/users/compute/orchestration/ec3/apps/ecas/ecas-front.png b/content/en/users/compute/orchestration/im/ec3/apps/ecas/ecas-front.png similarity index 100% rename from content/en/users/compute/orchestration/ec3/apps/ecas/ecas-front.png rename to content/en/users/compute/orchestration/im/ec3/apps/ecas/ecas-front.png diff --git a/content/en/users/compute/orchestration/ec3/apps/ecas/ecas-infra-io.png b/content/en/users/compute/orchestration/im/ec3/apps/ecas/ecas-infra-io.png similarity index 100% rename from content/en/users/compute/orchestration/ec3/apps/ecas/ecas-infra-io.png rename to content/en/users/compute/orchestration/im/ec3/apps/ecas/ecas-infra-io.png diff --git a/content/en/users/compute/orchestration/ec3/apps/ecas/ecas-infra-server.png b/content/en/users/compute/orchestration/im/ec3/apps/ecas/ecas-infra-server.png similarity index 100% rename from content/en/users/compute/orchestration/ec3/apps/ecas/ecas-infra-server.png rename to content/en/users/compute/orchestration/im/ec3/apps/ecas/ecas-infra-server.png diff --git a/content/en/users/compute/orchestration/ec3/apps/ecas/ecas-instance.png b/content/en/users/compute/orchestration/im/ec3/apps/ecas/ecas-instance.png similarity index 100% rename from content/en/users/compute/orchestration/ec3/apps/ecas/ecas-instance.png rename to content/en/users/compute/orchestration/im/ec3/apps/ecas/ecas-instance.png diff --git a/content/en/users/compute/orchestration/ec3/apps/ecas/ecas-jupyter.png b/content/en/users/compute/orchestration/im/ec3/apps/ecas/ecas-jupyter.png similarity index 100% rename from content/en/users/compute/orchestration/ec3/apps/ecas/ecas-jupyter.png rename to content/en/users/compute/orchestration/im/ec3/apps/ecas/ecas-jupyter.png diff --git a/content/en/users/compute/orchestration/ec3/apps/ecas/ecas-jupyterhub.png b/content/en/users/compute/orchestration/im/ec3/apps/ecas/ecas-jupyterhub.png similarity index 100% rename from content/en/users/compute/orchestration/ec3/apps/ecas/ecas-jupyterhub.png rename to content/en/users/compute/orchestration/im/ec3/apps/ecas/ecas-jupyterhub.png diff --git a/content/en/users/compute/orchestration/ec3/apps/ecas/ecas-list.png b/content/en/users/compute/orchestration/im/ec3/apps/ecas/ecas-list.png similarity index 100% rename from content/en/users/compute/orchestration/ec3/apps/ecas/ecas-list.png rename to content/en/users/compute/orchestration/im/ec3/apps/ecas/ecas-list.png diff --git a/content/en/users/compute/orchestration/ec3/apps/ecas/ecas-lrms.png b/content/en/users/compute/orchestration/im/ec3/apps/ecas/ecas-lrms.png similarity index 100% rename from content/en/users/compute/orchestration/ec3/apps/ecas/ecas-lrms.png rename to content/en/users/compute/orchestration/im/ec3/apps/ecas/ecas-lrms.png diff --git a/content/en/users/compute/orchestration/ec3/apps/ecas/ecas-manage.png b/content/en/users/compute/orchestration/im/ec3/apps/ecas/ecas-manage.png similarity index 100% rename from content/en/users/compute/orchestration/ec3/apps/ecas/ecas-manage.png rename to content/en/users/compute/orchestration/im/ec3/apps/ecas/ecas-manage.png diff --git a/content/en/users/compute/orchestration/ec3/apps/ecas/ecas-oph_term.png b/content/en/users/compute/orchestration/im/ec3/apps/ecas/ecas-oph_term.png similarity index 100% rename from content/en/users/compute/orchestration/ec3/apps/ecas/ecas-oph_term.png rename to content/en/users/compute/orchestration/im/ec3/apps/ecas/ecas-oph_term.png diff --git a/content/en/users/compute/orchestration/ec3/apps/ecas/ecas-os.png b/content/en/users/compute/orchestration/im/ec3/apps/ecas/ecas-os.png similarity index 100% rename from content/en/users/compute/orchestration/ec3/apps/ecas/ecas-os.png rename to content/en/users/compute/orchestration/im/ec3/apps/ecas/ecas-os.png diff --git a/content/en/users/compute/orchestration/ec3/apps/ecas/ecas-reduce.png b/content/en/users/compute/orchestration/im/ec3/apps/ecas/ecas-reduce.png similarity index 100% rename from content/en/users/compute/orchestration/ec3/apps/ecas/ecas-reduce.png rename to content/en/users/compute/orchestration/im/ec3/apps/ecas/ecas-reduce.png diff --git a/content/en/users/compute/orchestration/ec3/apps/ecas/ecas-size.png b/content/en/users/compute/orchestration/im/ec3/apps/ecas/ecas-size.png similarity index 100% rename from content/en/users/compute/orchestration/ec3/apps/ecas/ecas-size.png rename to content/en/users/compute/orchestration/im/ec3/apps/ecas/ecas-size.png diff --git a/content/en/users/compute/orchestration/ec3/apps/ecas/ecas-space.png b/content/en/users/compute/orchestration/im/ec3/apps/ecas/ecas-space.png similarity index 100% rename from content/en/users/compute/orchestration/ec3/apps/ecas/ecas-space.png rename to content/en/users/compute/orchestration/im/ec3/apps/ecas/ecas-space.png diff --git a/content/en/users/compute/orchestration/ec3/apps/ecas/ecas-summary.png b/content/en/users/compute/orchestration/im/ec3/apps/ecas/ecas-summary.png similarity index 100% rename from content/en/users/compute/orchestration/ec3/apps/ecas/ecas-summary.png rename to content/en/users/compute/orchestration/im/ec3/apps/ecas/ecas-summary.png diff --git a/content/en/users/compute/orchestration/ec3/apps/ecas/grafana-login.png b/content/en/users/compute/orchestration/im/ec3/apps/ecas/grafana-login.png similarity index 100% rename from content/en/users/compute/orchestration/ec3/apps/ecas/grafana-login.png rename to content/en/users/compute/orchestration/im/ec3/apps/ecas/grafana-login.png diff --git a/content/en/users/compute/orchestration/ec3/apps/htc/_index.md b/content/en/users/compute/orchestration/im/ec3/apps/htc/_index.md similarity index 100% rename from content/en/users/compute/orchestration/ec3/apps/htc/_index.md rename to content/en/users/compute/orchestration/im/ec3/apps/htc/_index.md diff --git a/content/en/users/compute/orchestration/ec3/cli/_index.md b/content/en/users/compute/orchestration/im/ec3/cli/_index.md similarity index 100% rename from content/en/users/compute/orchestration/ec3/cli/_index.md rename to content/en/users/compute/orchestration/im/ec3/cli/_index.md diff --git a/content/en/users/compute/orchestration/ec3/developers/_index.md b/content/en/users/compute/orchestration/im/ec3/developers/_index.md similarity index 95% rename from content/en/users/compute/orchestration/ec3/developers/_index.md rename to content/en/users/compute/orchestration/im/ec3/developers/_index.md index a6e61e48f5..5195d77aef 100644 --- a/content/en/users/compute/orchestration/ec3/developers/_index.md +++ b/content/en/users/compute/orchestration/im/ec3/developers/_index.md @@ -29,6 +29,6 @@ following process: {{% alert title="Note" color="info" %}} For more information please contact * Miguel Caballer: `micafer1 upv.es` -* Amanda Calatrav: `amcaar i3m.upv.es` +* Amanda Calatrava: `amcaar i3m.upv.es` {{% /alert %}} diff --git a/content/en/users/compute/orchestration/ec3/portal/_index.md b/content/en/users/compute/orchestration/im/ec3/portal/_index.md similarity index 100% rename from content/en/users/compute/orchestration/ec3/portal/_index.md rename to content/en/users/compute/orchestration/im/ec3/portal/_index.md diff --git a/content/en/users/compute/orchestration/ec3/portal/ec3-endpoint.png b/content/en/users/compute/orchestration/im/ec3/portal/ec3-endpoint.png similarity index 100% rename from content/en/users/compute/orchestration/ec3/portal/ec3-endpoint.png rename to content/en/users/compute/orchestration/im/ec3/portal/ec3-endpoint.png diff --git a/content/en/users/compute/orchestration/ec3/portal/ec3-lrms.png b/content/en/users/compute/orchestration/im/ec3/portal/ec3-lrms.png similarity index 100% rename from content/en/users/compute/orchestration/ec3/portal/ec3-lrms.png rename to content/en/users/compute/orchestration/im/ec3/portal/ec3-lrms.png diff --git a/content/en/users/compute/orchestration/ec3/portal/ec3-nodes.png b/content/en/users/compute/orchestration/im/ec3/portal/ec3-nodes.png similarity index 100% rename from content/en/users/compute/orchestration/ec3/portal/ec3-nodes.png rename to content/en/users/compute/orchestration/im/ec3/portal/ec3-nodes.png diff --git a/content/en/users/compute/orchestration/ec3/portal/ec3-portal.png b/content/en/users/compute/orchestration/im/ec3/portal/ec3-portal.png similarity index 100% rename from content/en/users/compute/orchestration/ec3/portal/ec3-portal.png rename to content/en/users/compute/orchestration/im/ec3/portal/ec3-portal.png diff --git a/content/en/users/compute/orchestration/ec3/portal/ec3-size.png b/content/en/users/compute/orchestration/im/ec3/portal/ec3-size.png similarity index 100% rename from content/en/users/compute/orchestration/ec3/portal/ec3-size.png rename to content/en/users/compute/orchestration/im/ec3/portal/ec3-size.png diff --git a/content/en/users/compute/orchestration/indigo-paas/_index.md b/content/en/users/compute/orchestration/indigo-paas/_index.md deleted file mode 100644 index 3e62d3f10e..0000000000 --- a/content/en/users/compute/orchestration/indigo-paas/_index.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -title: INDIGO PaaS Orchestrator -linkTitle: PaaS Orchestrator -draft: true -type: docs -weight: 30 -description: > - Subtitle here ---- - -## What is it? - -TBD