From 0e13222b05cf354d24ed9264d3ae59de91be159f Mon Sep 17 00:00:00 2001
From: "gioacchino.vino" <gioacchino.vino@infn.it>
Date: Thu, 16 Nov 2023 10:55:25 +0100
Subject: [PATCH 01/11] Set tosca-types branch CLOUD-1996
---
docker/docker_compose.yaml | 2 +-
docker/docker_compose_with_volume.yaml | 2 +-
docker/private-net/docker_compose.yaml | 2 +-
docker/private-net/docker_compose_with_volume.yaml | 2 +-
docker/private-net/run_docker.yaml | 2 +-
docker/private-net/run_docker_with_volume.yaml | 2 +-
docker/run_docker.yaml | 2 +-
docker/run_docker_with_volume.yaml | 2 +-
jupyter/cygno_experiment.yaml | 2 +-
jupyter/jupyter_matlab.yaml | 2 +-
jupyter/jupyter_vm.yaml | 2 +-
jupyter/ml_infn.yaml | 2 +-
jupyter/private-net/jupyter_vm.yaml | 2 +-
kubernetes/htcondor_k8s.yaml | 2 +-
kubernetes/k8s_cluster.yaml | 2 +-
kubernetes/k8s_cluster_with_addons.yaml | 2 +-
kubernetes/private-net/htcondor_k8s.yaml | 2 +-
kubernetes/private-net/k8s_cluster.yaml | 2 +-
kubernetes/private-net/spark_cluster.yaml | 2 +-
kubernetes/spark_cluster.yaml | 2 +-
mesos/mesos_cluster.yaml | 2 +-
mesos/rstudio.yaml | 2 +-
mesos/tensorflow-gpu.yaml | 2 +-
single-vm/cloud_storage_service.yaml | 2 +-
single-vm/elasticsearch_kibana.yaml | 2 +-
single-vm/htcondor_mini.yaml | 2 +-
single-vm/iam_voms-aa.yaml | 4 ++--
single-vm/private-net/elasticsearch_kibana.yaml | 2 +-
single-vm/private-net/single_vm.yaml | 2 +-
single-vm/private-net/single_vm_with_volume.yaml | 2 +-
single-vm/single_vm.yaml | 2 +-
single-vm/single_vm_with_volume.yaml | 2 +-
32 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/docker/docker_compose.yaml b/docker/docker_compose.yaml
index ee56abd..5fa7847 100644
--- a/docker/docker_compose.yaml
+++ b/docker/docker_compose.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v2.8.0/tosca_types/infrastructure/docker_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/infrastructure/docker_types.yaml
description: >
Deploy a virtual machine with docker engine and docker-compose pre-installed.
diff --git a/docker/docker_compose_with_volume.yaml b/docker/docker_compose_with_volume.yaml
index a7af1a3..dae113d 100644
--- a/docker/docker_compose_with_volume.yaml
+++ b/docker/docker_compose_with_volume.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v2.8.0/tosca_types/infrastructure/docker_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/infrastructure/docker_types.yaml
description: >
Deploy a virtual machine with docker engine and docker-compose pre-installed.
diff --git a/docker/private-net/docker_compose.yaml b/docker/private-net/docker_compose.yaml
index d5f1f24..804bdc0 100644
--- a/docker/private-net/docker_compose.yaml
+++ b/docker/private-net/docker_compose.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v2.8.0/tosca_types/infrastructure/docker_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/infrastructure/docker_types.yaml
description: >
Deploy a virtual machine with docker engine and docker-compose pre-installed.
diff --git a/docker/private-net/docker_compose_with_volume.yaml b/docker/private-net/docker_compose_with_volume.yaml
index 8bde24b..4d45600 100644
--- a/docker/private-net/docker_compose_with_volume.yaml
+++ b/docker/private-net/docker_compose_with_volume.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v2.8.0/tosca_types/infrastructure/docker_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/infrastructure/docker_types.yaml
description: >
Deploy a virtual machine with docker engine and docker-compose pre-installed.
diff --git a/docker/private-net/run_docker.yaml b/docker/private-net/run_docker.yaml
index e8ae342..3e3d45f 100644
--- a/docker/private-net/run_docker.yaml
+++ b/docker/private-net/run_docker.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v2.8.0/tosca_types/infrastructure/docker_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/infrastructure/docker_types.yaml
description: Run a docker container
diff --git a/docker/private-net/run_docker_with_volume.yaml b/docker/private-net/run_docker_with_volume.yaml
index ca9ca83..62fe55a 100644
--- a/docker/private-net/run_docker_with_volume.yaml
+++ b/docker/private-net/run_docker_with_volume.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v2.6.0/tosca_types/infrastructure/docker_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/infrastructure/docker_types.yaml
description: Run a docker container with persistent volume for data
diff --git a/docker/run_docker.yaml b/docker/run_docker.yaml
index 13203e1..b9b9c53 100644
--- a/docker/run_docker.yaml
+++ b/docker/run_docker.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v2.8.0/tosca_types/infrastructure/docker_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/infrastructure/docker_types.yaml
description: Run a docker container
diff --git a/docker/run_docker_with_volume.yaml b/docker/run_docker_with_volume.yaml
index f41b24d..5963285 100644
--- a/docker/run_docker_with_volume.yaml
+++ b/docker/run_docker_with_volume.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v2.6.0/tosca_types/infrastructure/docker_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/infrastructure/docker_types.yaml
description: Run a docker container with persistent volume for data
diff --git a/jupyter/cygno_experiment.yaml b/jupyter/cygno_experiment.yaml
index be50012..41795bb 100644
--- a/jupyter/cygno_experiment.yaml
+++ b/jupyter/cygno_experiment.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v2.8.0/tosca_types/applications/jupyter_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/applications/jupyter_types.yaml
description: >
Run a single VM with CYGNO Environment prepared exposing both ssh access and JupyterHub interface.
diff --git a/jupyter/jupyter_matlab.yaml b/jupyter/jupyter_matlab.yaml
index dfc12ec..b7ab7b9 100644
--- a/jupyter/jupyter_matlab.yaml
+++ b/jupyter/jupyter_matlab.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v2.8.0/tosca_types/applications/jupyter_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/applications/jupyter_types.yaml
description: Run Jupyter on a single VM enabling Notebooks persistence
diff --git a/jupyter/jupyter_vm.yaml b/jupyter/jupyter_vm.yaml
index a0f7ffd..097ad06 100644
--- a/jupyter/jupyter_vm.yaml
+++ b/jupyter/jupyter_vm.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v2.8.0/tosca_types/applications/jupyter_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/applications/jupyter_types.yaml
description: Run Jupyter on a single VM enabling Notebooks persistence
diff --git a/jupyter/ml_infn.yaml b/jupyter/ml_infn.yaml
index bf1dc8a..25b2489 100644
--- a/jupyter/ml_infn.yaml
+++ b/jupyter/ml_infn.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v2.8.0/tosca_types/applications/jupyter_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/applications/jupyter_types.yaml
description: Run a single VM with exposing both ssh access and multiuser JupyterHub interface, integrating the ML-INFN envirnoment
diff --git a/jupyter/private-net/jupyter_vm.yaml b/jupyter/private-net/jupyter_vm.yaml
index 4d0f5b7..5432c55 100644
--- a/jupyter/private-net/jupyter_vm.yaml
+++ b/jupyter/private-net/jupyter_vm.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v2.8.0/tosca_types/applications/jupyter_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/applications/jupyter_types.yaml
description: Run Jupyter on a single VM enabling Notebooks persistence
diff --git a/kubernetes/htcondor_k8s.yaml b/kubernetes/htcondor_k8s.yaml
index 39fea9a..05d0c07 100644
--- a/kubernetes/htcondor_k8s.yaml
+++ b/kubernetes/htcondor_k8s.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v2.8.0/tosca_types/applications/htcondor_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/applications/htcondor_types.yaml
description: Deploy a complete HTCondor cluster
diff --git a/kubernetes/k8s_cluster.yaml b/kubernetes/k8s_cluster.yaml
index fddf72f..7fd47ed 100644
--- a/kubernetes/k8s_cluster.yaml
+++ b/kubernetes/k8s_cluster.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v2.8.0/tosca_types/infrastructure/kubernetes_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/infrastructure/kubernetes_types.yaml
description: Deploy a single master Kubernetes 1.28.1 cluster
diff --git a/kubernetes/k8s_cluster_with_addons.yaml b/kubernetes/k8s_cluster_with_addons.yaml
index 2ee1fc8..791c35d 100644
--- a/kubernetes/k8s_cluster_with_addons.yaml
+++ b/kubernetes/k8s_cluster_with_addons.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v2.8.0/tosca_types/infrastructure/kubernetes_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/infrastructure/kubernetes_types.yaml
description: Deploy a single master Kubernetes 1.28.1 cluster with a Kafka instance
metadata:
diff --git a/kubernetes/private-net/htcondor_k8s.yaml b/kubernetes/private-net/htcondor_k8s.yaml
index a0ca460..095a1b7 100644
--- a/kubernetes/private-net/htcondor_k8s.yaml
+++ b/kubernetes/private-net/htcondor_k8s.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v2.8.0/tosca_types/applications/htcondor_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/applications/htcondor_types.yaml
description: Deploy a complete HTCondor cluster
diff --git a/kubernetes/private-net/k8s_cluster.yaml b/kubernetes/private-net/k8s_cluster.yaml
index 2c1e289..7bfd967 100644
--- a/kubernetes/private-net/k8s_cluster.yaml
+++ b/kubernetes/private-net/k8s_cluster.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v2.8.0/tosca_types/infrastructure/kubernetes_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/infrastructure/kubernetes_types.yaml
description: Deploy a single master Kubernetes 1.28.1 cluster
diff --git a/kubernetes/private-net/spark_cluster.yaml b/kubernetes/private-net/spark_cluster.yaml
index 880c1c3..844ca83 100644
--- a/kubernetes/private-net/spark_cluster.yaml
+++ b/kubernetes/private-net/spark_cluster.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v2.8.0/tosca_types/applications/spark_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/applications/spark_types.yaml
description: Deploy a complete Spark 3.4.1 + Jupyter Notebook on top of a Kubernetes (K8s) 1.28.1 computing cluster
diff --git a/kubernetes/spark_cluster.yaml b/kubernetes/spark_cluster.yaml
index b51e4ae..7c90eb2 100644
--- a/kubernetes/spark_cluster.yaml
+++ b/kubernetes/spark_cluster.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v2.8.0/tosca_types/applications/spark_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/applications/spark_types.yaml
description: Deploy a complete Spark 3.4.1 + Jupyter Notebook on top of a Kubernetes (K8s) 1.28.1 computing cluster
diff --git a/mesos/mesos_cluster.yaml b/mesos/mesos_cluster.yaml
index a4fb1cc..425b3b2 100644
--- a/mesos/mesos_cluster.yaml
+++ b/mesos/mesos_cluster.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v2.8.0/tosca_types/infrastructure/mesos_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/infrastructure/mesos_types.yaml
description: Apache Mesos abstracts CPU, memory, storage, and other compute resources away from machines (physical or virtual), enabling fault-tolerant and elastic distributed systems to easily be built and run effectively
diff --git a/mesos/rstudio.yaml b/mesos/rstudio.yaml
index da10610..1d275fd 100644
--- a/mesos/rstudio.yaml
+++ b/mesos/rstudio.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v2.8.0/tosca_types/infrastructure/docker_runtime_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/infrastructure/docker_runtime_types.yaml
description: >
RStudio is an integrated development environment (IDE) for R. It includes a console, syntax-highlighting editor that supports direct code execution, as well as tools for plotting, history, debugging and workspace management.
diff --git a/mesos/tensorflow-gpu.yaml b/mesos/tensorflow-gpu.yaml
index bcd8d7d..4ae62fc 100644
--- a/mesos/tensorflow-gpu.yaml
+++ b/mesos/tensorflow-gpu.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v2.8.0/tosca_types/infrastructure/docker_runtime_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/infrastructure/docker_runtime_types.yaml
description: >
Run an instance of Tensorflow with GPU
diff --git a/single-vm/cloud_storage_service.yaml b/single-vm/cloud_storage_service.yaml
index 4ffe9dd..effe9f2 100644
--- a/single-vm/cloud_storage_service.yaml
+++ b/single-vm/cloud_storage_service.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v2.8.0/tosca_types/applications/storage_apps_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/applications/storage_apps_types.yaml
description: >
Deploy a cloud storage service
diff --git a/single-vm/elasticsearch_kibana.yaml b/single-vm/elasticsearch_kibana.yaml
index 2dc8046..0eac603 100644
--- a/single-vm/elasticsearch_kibana.yaml
+++ b/single-vm/elasticsearch_kibana.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v2.8.0/tosca_types/applications/elastic_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/applications/elastic_types.yaml
description: >
Deploy a virtual machine pre-configured with the Elasticsearch search and analytics engine and with Kibana for simple visualization of data with charts and graphs in Elasticsearch
diff --git a/single-vm/htcondor_mini.yaml b/single-vm/htcondor_mini.yaml
index c6ad5cb..59ca3c7 100644
--- a/single-vm/htcondor_mini.yaml
+++ b/single-vm/htcondor_mini.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v2.8.0/tosca_types/applications/htcondor_mini_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/applications/htcondor_mini_types.yaml
description: Deploy HTCondor mini, a technology preview of an all-in-one ("minicondor") HTCondor. This type of install is useful for testing and experimentation.
diff --git a/single-vm/iam_voms-aa.yaml b/single-vm/iam_voms-aa.yaml
index 1e84c19..d180477 100644
--- a/single-vm/iam_voms-aa.yaml
+++ b/single-vm/iam_voms-aa.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v2.8.0/tosca_types/applications/iam_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/applications/iam_types.yaml
description: >
The on-demand deployment service for the INDIGO IAM provides a quick and easy way for organizations to deploy their own instance of the INDIGO IAM, which is an open-source Identity and Access Management system.
@@ -480,7 +480,7 @@ topology_template:
privacy_policy_url: { get_input: privacy_policy_url }
privacy_policy_text: { get_input: privacy_policy_text }
jwt_default_profile: { get_input: jwt_default_profile }
- docker_compose_file_url: https://baltig.infn.it/infn-cloud/tosca-types/raw/v2.8.0/artifacts/docker/iam/docker-compose.yml
+ docker_compose_file_url: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/artifacts/docker/iam/docker-compose.yml
environment_variables: { get_input: environment_variables }
server_ip: { get_attribute: [HOST, public_address, 0] }
dns_name: { concat: [get_attribute: [HOST, public_address, 0], ".", get_property: [ SELF, network_domain ]] }
diff --git a/single-vm/private-net/elasticsearch_kibana.yaml b/single-vm/private-net/elasticsearch_kibana.yaml
index 339d0ec..fdadf41 100644
--- a/single-vm/private-net/elasticsearch_kibana.yaml
+++ b/single-vm/private-net/elasticsearch_kibana.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v2.8.0/tosca_types/applications/elastic_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/applications/elastic_types.yaml
description: >
Deploy a virtual machine pre-configured with the Elasticsearch search and analytics engine and with Kibana for simple visualization of data with charts and graphs in Elasticsearch
diff --git a/single-vm/private-net/single_vm.yaml b/single-vm/private-net/single_vm.yaml
index a2c5caf..014076f 100644
--- a/single-vm/private-net/single_vm.yaml
+++ b/single-vm/private-net/single_vm.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v2.8.0/tosca_types/base/basic_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/base/basic_types.yaml
description: >
Launch a compute node getting the IP and SSH credentials to access via ssh
diff --git a/single-vm/private-net/single_vm_with_volume.yaml b/single-vm/private-net/single_vm_with_volume.yaml
index bf9c8ef..e32dbe1 100644
--- a/single-vm/private-net/single_vm_with_volume.yaml
+++ b/single-vm/private-net/single_vm_with_volume.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v2.8.0/tosca_types/base/basic_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/base/basic_types.yaml
description: >
Launch a compute node with attached volume and get the IP and SSH credentials to access via ssh
diff --git a/single-vm/single_vm.yaml b/single-vm/single_vm.yaml
index 60056b3..228c7d4 100644
--- a/single-vm/single_vm.yaml
+++ b/single-vm/single_vm.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v2.8.0/tosca_types/base/basic_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/base/basic_types.yaml
description: >
Launch a compute node getting the IP and SSH credentials to access via ssh
diff --git a/single-vm/single_vm_with_volume.yaml b/single-vm/single_vm_with_volume.yaml
index 44870ef..d74afb5 100644
--- a/single-vm/single_vm_with_volume.yaml
+++ b/single-vm/single_vm_with_volume.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v2.8.0/tosca_types/base/basic_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/base/basic_types.yaml
description: >
Launch a compute node with attached volume and get the IP and SSH credentials to access via ssh
--
GitLab
From 672a0ad6b48ee7037245dabdb69b01a8a5f0fe3b Mon Sep 17 00:00:00 2001
From: "gioacchino.vino" <gioacchino.vino@infn.it>
Date: Thu, 16 Nov 2023 13:36:33 +0100
Subject: [PATCH 02/11] CLOUD-1996
---
jupyter/jupyter_vm.yaml | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/jupyter/jupyter_vm.yaml b/jupyter/jupyter_vm.yaml
index 097ad06..0750941 100644
--- a/jupyter/jupyter_vm.yaml
+++ b/jupyter/jupyter_vm.yaml
@@ -124,9 +124,18 @@ topology_template:
node_templates:
+ iam_client:
+ type: tosca.nodes.indigo.iam.client
+ properties:
+ scopes: openid email profile wlcg offline_access address wlcg.groups
+
ml_install:
type: tosca.nodes.DODAS.single-node-jupyterhub
properties:
+ iam_issuer: { get_property : [ iam_client, issuer ] }
+ iam_client_id: { get_property : [ iam_client, client_id ] }
+ iam_token: { get_property : [ iam_client, registration_access_token ] }
+ iam_server_ip: { get_attribute: [HOST, public_address, 0] }
contact_email: { get_input: contact_email }
iam_url: { get_input: iam_url }
iam_subject: { get_input: iam_subject }
--
GitLab
From ff7cb90fb06cdcb37d494d0de094ed63fc31e5c3 Mon Sep 17 00:00:00 2001
From: "gioacchino.vino" <gioacchino.vino@infn.it>
Date: Mon, 11 Dec 2023 17:57:46 +0100
Subject: [PATCH 03/11] Allign jupyter template to new iam client management
---
jupyter/cygno_experiment.yaml | 7 +++++++
jupyter/jupyter_matlab.yaml | 11 +++++++++--
jupyter/jupyter_vm.yaml | 2 --
jupyter/ml_infn.yaml | 7 +++++++
jupyter/private-net/jupyter_vm.yaml | 7 +++++++
5 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/jupyter/cygno_experiment.yaml b/jupyter/cygno_experiment.yaml
index 41795bb..4071b7f 100644
--- a/jupyter/cygno_experiment.yaml
+++ b/jupyter/cygno_experiment.yaml
@@ -109,9 +109,16 @@ topology_template:
node_templates:
+ iam_client:
+ type: tosca.nodes.indigo.iam.client
+ properties:
+ scopes: openid email profile wlcg offline_access address wlcg.groups
+
ml_install:
type: tosca.nodes.DODAS.single-node-jupyterhub
properties:
+ iam_client_id: { get_property : [ iam_client, client_id ] }
+ iam_token: { get_property : [ iam_client, registration_access_token ] }
iam_url: { get_input: iam_url }
iam_subject: { get_input: iam_subject }
iam_groups: { get_input: iam_groups }
diff --git a/jupyter/jupyter_matlab.yaml b/jupyter/jupyter_matlab.yaml
index b7ab7b9..1095827 100644
--- a/jupyter/jupyter_matlab.yaml
+++ b/jupyter/jupyter_matlab.yaml
@@ -109,11 +109,18 @@ topology_template:
type: tosca.datatypes.indigo.network.PortSpec
node_templates:
+
+ iam_client:
+ type: tosca.nodes.indigo.iam.client
+ properties:
+ scopes: openid email profile wlcg offline_access address wlcg.groups
+
ml_install:
type: tosca.nodes.DODAS.single-node-jupyterhub
properties:
- letsencrypt_test: false
- contact_email: { get_input: contact_email }
+ iam_client_id: { get_property : [ iam_client, client_id ] }
+ iam_token: { get_property : [ iam_client, registration_access_token ] }
+ #letsencrypt_test: false #Commented because not in tosca.nodes.DODAS.single-node-jupyterhub contact_email: { get_input: contact_email }
iam_url: { get_input: iam_url }
iam_subject: { get_input: iam_subject }
iam_groups: { get_input: iam_groups }
diff --git a/jupyter/jupyter_vm.yaml b/jupyter/jupyter_vm.yaml
index 0750941..ee3c4f3 100644
--- a/jupyter/jupyter_vm.yaml
+++ b/jupyter/jupyter_vm.yaml
@@ -132,10 +132,8 @@ topology_template:
ml_install:
type: tosca.nodes.DODAS.single-node-jupyterhub
properties:
- iam_issuer: { get_property : [ iam_client, issuer ] }
iam_client_id: { get_property : [ iam_client, client_id ] }
iam_token: { get_property : [ iam_client, registration_access_token ] }
- iam_server_ip: { get_attribute: [HOST, public_address, 0] }
contact_email: { get_input: contact_email }
iam_url: { get_input: iam_url }
iam_subject: { get_input: iam_subject }
diff --git a/jupyter/ml_infn.yaml b/jupyter/ml_infn.yaml
index 25b2489..d57f03b 100644
--- a/jupyter/ml_infn.yaml
+++ b/jupyter/ml_infn.yaml
@@ -155,9 +155,16 @@ topology_template:
node_templates:
+ iam_client:
+ type: tosca.nodes.indigo.iam.client
+ properties:
+ scopes: openid email profile wlcg offline_access address wlcg.groups
+
ml_install:
type: tosca.nodes.DODAS.single-node-jupyterhub
properties:
+ iam_client_id: { get_property : [ iam_client, client_id ] }
+ iam_token: { get_property : [ iam_client, registration_access_token ] }
iam_url: { get_input: iam_url }
iam_subject: { get_input: iam_subject }
iam_groups: { get_input: iam_groups }
diff --git a/jupyter/private-net/jupyter_vm.yaml b/jupyter/private-net/jupyter_vm.yaml
index 5432c55..f523d44 100644
--- a/jupyter/private-net/jupyter_vm.yaml
+++ b/jupyter/private-net/jupyter_vm.yaml
@@ -118,9 +118,16 @@ topology_template:
node_templates:
+ iam_client:
+ type: tosca.nodes.indigo.iam.client
+ properties:
+ scopes: openid email profile wlcg offline_access address wlcg.groups
+
ml_install:
type: tosca.nodes.DODAS.single-node-jupyterhub
properties:
+ iam_client_id: { get_property : [ iam_client, client_id ] }
+ iam_token: { get_property : [ iam_client, registration_access_token ] }
contact_email: { get_input: contact_email }
iam_url: { get_input: iam_url }
iam_subject: { get_input: iam_subject }
--
GitLab
From 6e06f5f31acef32496ceee0fc4b58c962abc568e Mon Sep 17 00:00:00 2001
From: "gioacchino.vino" <gioacchino.vino@infn.it>
Date: Mon, 11 Dec 2023 17:58:46 +0100
Subject: [PATCH 04/11] Set tosca-types branch v3.3.0
---
docker/docker_compose.yaml | 2 +-
docker/docker_compose_with_volume.yaml | 2 +-
docker/private-net/docker_compose.yaml | 2 +-
docker/private-net/docker_compose_with_volume.yaml | 2 +-
docker/private-net/run_docker.yaml | 2 +-
docker/private-net/run_docker_with_volume.yaml | 2 +-
docker/run_docker.yaml | 2 +-
docker/run_docker_with_volume.yaml | 2 +-
jupyter/cygno_experiment.yaml | 2 +-
jupyter/jupyter_matlab.yaml | 2 +-
jupyter/jupyter_vm.yaml | 2 +-
jupyter/ml_infn.yaml | 2 +-
jupyter/private-net/jupyter_vm.yaml | 2 +-
kubernetes/htcondor_k8s.yaml | 2 +-
kubernetes/k8s_cluster.yaml | 2 +-
kubernetes/k8s_cluster_with_addons.yaml | 2 +-
kubernetes/private-net/htcondor_k8s.yaml | 2 +-
kubernetes/private-net/k8s_cluster.yaml | 2 +-
kubernetes/private-net/spark_cluster.yaml | 2 +-
kubernetes/spark_cluster.yaml | 2 +-
mesos/mesos_cluster.yaml | 2 +-
mesos/rstudio.yaml | 2 +-
mesos/tensorflow-gpu.yaml | 2 +-
single-vm/cloud_storage_service.yaml | 2 +-
single-vm/elasticsearch_kibana.yaml | 2 +-
single-vm/htcondor_mini.yaml | 2 +-
single-vm/iam_voms-aa.yaml | 4 ++--
single-vm/private-net/elasticsearch_kibana.yaml | 2 +-
single-vm/private-net/single_vm.yaml | 2 +-
single-vm/private-net/single_vm_with_volume.yaml | 2 +-
single-vm/single_vm.yaml | 2 +-
single-vm/single_vm_with_volume.yaml | 2 +-
32 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/docker/docker_compose.yaml b/docker/docker_compose.yaml
index 5fa7847..639f561 100644
--- a/docker/docker_compose.yaml
+++ b/docker/docker_compose.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/infrastructure/docker_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v3.3.0/tosca_types/infrastructure/docker_types.yaml
description: >
Deploy a virtual machine with docker engine and docker-compose pre-installed.
diff --git a/docker/docker_compose_with_volume.yaml b/docker/docker_compose_with_volume.yaml
index dae113d..ec21c0d 100644
--- a/docker/docker_compose_with_volume.yaml
+++ b/docker/docker_compose_with_volume.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/infrastructure/docker_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v3.3.0/tosca_types/infrastructure/docker_types.yaml
description: >
Deploy a virtual machine with docker engine and docker-compose pre-installed.
diff --git a/docker/private-net/docker_compose.yaml b/docker/private-net/docker_compose.yaml
index 804bdc0..8cd339a 100644
--- a/docker/private-net/docker_compose.yaml
+++ b/docker/private-net/docker_compose.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/infrastructure/docker_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v3.3.0/tosca_types/infrastructure/docker_types.yaml
description: >
Deploy a virtual machine with docker engine and docker-compose pre-installed.
diff --git a/docker/private-net/docker_compose_with_volume.yaml b/docker/private-net/docker_compose_with_volume.yaml
index 4d45600..6c24d48 100644
--- a/docker/private-net/docker_compose_with_volume.yaml
+++ b/docker/private-net/docker_compose_with_volume.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/infrastructure/docker_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v3.3.0/tosca_types/infrastructure/docker_types.yaml
description: >
Deploy a virtual machine with docker engine and docker-compose pre-installed.
diff --git a/docker/private-net/run_docker.yaml b/docker/private-net/run_docker.yaml
index 3e3d45f..c3aa597 100644
--- a/docker/private-net/run_docker.yaml
+++ b/docker/private-net/run_docker.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/infrastructure/docker_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v3.3.0/tosca_types/infrastructure/docker_types.yaml
description: Run a docker container
diff --git a/docker/private-net/run_docker_with_volume.yaml b/docker/private-net/run_docker_with_volume.yaml
index 62fe55a..318ff62 100644
--- a/docker/private-net/run_docker_with_volume.yaml
+++ b/docker/private-net/run_docker_with_volume.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/infrastructure/docker_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v3.3.0/tosca_types/infrastructure/docker_types.yaml
description: Run a docker container with persistent volume for data
diff --git a/docker/run_docker.yaml b/docker/run_docker.yaml
index b9b9c53..2b91533 100644
--- a/docker/run_docker.yaml
+++ b/docker/run_docker.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/infrastructure/docker_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v3.3.0/tosca_types/infrastructure/docker_types.yaml
description: Run a docker container
diff --git a/docker/run_docker_with_volume.yaml b/docker/run_docker_with_volume.yaml
index 5963285..5c7005f 100644
--- a/docker/run_docker_with_volume.yaml
+++ b/docker/run_docker_with_volume.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/infrastructure/docker_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v3.3.0/tosca_types/infrastructure/docker_types.yaml
description: Run a docker container with persistent volume for data
diff --git a/jupyter/cygno_experiment.yaml b/jupyter/cygno_experiment.yaml
index 4071b7f..8f2b6c8 100644
--- a/jupyter/cygno_experiment.yaml
+++ b/jupyter/cygno_experiment.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/applications/jupyter_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v3.3.0/tosca_types/applications/jupyter_types.yaml
description: >
Run a single VM with CYGNO Environment prepared exposing both ssh access and JupyterHub interface.
diff --git a/jupyter/jupyter_matlab.yaml b/jupyter/jupyter_matlab.yaml
index 1095827..7b29735 100644
--- a/jupyter/jupyter_matlab.yaml
+++ b/jupyter/jupyter_matlab.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/applications/jupyter_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v3.3.0/tosca_types/applications/jupyter_types.yaml
description: Run Jupyter on a single VM enabling Notebooks persistence
diff --git a/jupyter/jupyter_vm.yaml b/jupyter/jupyter_vm.yaml
index ee3c4f3..2a601b3 100644
--- a/jupyter/jupyter_vm.yaml
+++ b/jupyter/jupyter_vm.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/applications/jupyter_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v3.3.0/tosca_types/applications/jupyter_types.yaml
description: Run Jupyter on a single VM enabling Notebooks persistence
diff --git a/jupyter/ml_infn.yaml b/jupyter/ml_infn.yaml
index d57f03b..8eeca91 100644
--- a/jupyter/ml_infn.yaml
+++ b/jupyter/ml_infn.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/applications/jupyter_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v3.3.0/tosca_types/applications/jupyter_types.yaml
description: Run a single VM with exposing both ssh access and multiuser JupyterHub interface, integrating the ML-INFN envirnoment
diff --git a/jupyter/private-net/jupyter_vm.yaml b/jupyter/private-net/jupyter_vm.yaml
index f523d44..93191af 100644
--- a/jupyter/private-net/jupyter_vm.yaml
+++ b/jupyter/private-net/jupyter_vm.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/applications/jupyter_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v3.3.0/tosca_types/applications/jupyter_types.yaml
description: Run Jupyter on a single VM enabling Notebooks persistence
diff --git a/kubernetes/htcondor_k8s.yaml b/kubernetes/htcondor_k8s.yaml
index 05d0c07..4ebf0b4 100644
--- a/kubernetes/htcondor_k8s.yaml
+++ b/kubernetes/htcondor_k8s.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/applications/htcondor_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v3.3.0/tosca_types/applications/htcondor_types.yaml
description: Deploy a complete HTCondor cluster
diff --git a/kubernetes/k8s_cluster.yaml b/kubernetes/k8s_cluster.yaml
index 7fd47ed..d61220d 100644
--- a/kubernetes/k8s_cluster.yaml
+++ b/kubernetes/k8s_cluster.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/infrastructure/kubernetes_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v3.3.0/tosca_types/infrastructure/kubernetes_types.yaml
description: Deploy a single master Kubernetes 1.28.1 cluster
diff --git a/kubernetes/k8s_cluster_with_addons.yaml b/kubernetes/k8s_cluster_with_addons.yaml
index 791c35d..b596c05 100644
--- a/kubernetes/k8s_cluster_with_addons.yaml
+++ b/kubernetes/k8s_cluster_with_addons.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/infrastructure/kubernetes_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v3.3.0/tosca_types/infrastructure/kubernetes_types.yaml
description: Deploy a single master Kubernetes 1.28.1 cluster with a Kafka instance
metadata:
diff --git a/kubernetes/private-net/htcondor_k8s.yaml b/kubernetes/private-net/htcondor_k8s.yaml
index 095a1b7..c1284c8 100644
--- a/kubernetes/private-net/htcondor_k8s.yaml
+++ b/kubernetes/private-net/htcondor_k8s.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/applications/htcondor_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v3.3.0/tosca_types/applications/htcondor_types.yaml
description: Deploy a complete HTCondor cluster
diff --git a/kubernetes/private-net/k8s_cluster.yaml b/kubernetes/private-net/k8s_cluster.yaml
index 7bfd967..287cfa8 100644
--- a/kubernetes/private-net/k8s_cluster.yaml
+++ b/kubernetes/private-net/k8s_cluster.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/infrastructure/kubernetes_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v3.3.0/tosca_types/infrastructure/kubernetes_types.yaml
description: Deploy a single master Kubernetes 1.28.1 cluster
diff --git a/kubernetes/private-net/spark_cluster.yaml b/kubernetes/private-net/spark_cluster.yaml
index 844ca83..00a3b68 100644
--- a/kubernetes/private-net/spark_cluster.yaml
+++ b/kubernetes/private-net/spark_cluster.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/applications/spark_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v3.3.0/tosca_types/applications/spark_types.yaml
description: Deploy a complete Spark 3.4.1 + Jupyter Notebook on top of a Kubernetes (K8s) 1.28.1 computing cluster
diff --git a/kubernetes/spark_cluster.yaml b/kubernetes/spark_cluster.yaml
index 7c90eb2..2f4225c 100644
--- a/kubernetes/spark_cluster.yaml
+++ b/kubernetes/spark_cluster.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/applications/spark_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v3.3.0/tosca_types/applications/spark_types.yaml
description: Deploy a complete Spark 3.4.1 + Jupyter Notebook on top of a Kubernetes (K8s) 1.28.1 computing cluster
diff --git a/mesos/mesos_cluster.yaml b/mesos/mesos_cluster.yaml
index 425b3b2..ab5953e 100644
--- a/mesos/mesos_cluster.yaml
+++ b/mesos/mesos_cluster.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/infrastructure/mesos_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v3.3.0/tosca_types/infrastructure/mesos_types.yaml
description: Apache Mesos abstracts CPU, memory, storage, and other compute resources away from machines (physical or virtual), enabling fault-tolerant and elastic distributed systems to easily be built and run effectively
diff --git a/mesos/rstudio.yaml b/mesos/rstudio.yaml
index 1d275fd..a44c72b 100644
--- a/mesos/rstudio.yaml
+++ b/mesos/rstudio.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/infrastructure/docker_runtime_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v3.3.0/tosca_types/infrastructure/docker_runtime_types.yaml
description: >
RStudio is an integrated development environment (IDE) for R. It includes a console, syntax-highlighting editor that supports direct code execution, as well as tools for plotting, history, debugging and workspace management.
diff --git a/mesos/tensorflow-gpu.yaml b/mesos/tensorflow-gpu.yaml
index 4ae62fc..b2fef71 100644
--- a/mesos/tensorflow-gpu.yaml
+++ b/mesos/tensorflow-gpu.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/infrastructure/docker_runtime_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v3.3.0/tosca_types/infrastructure/docker_runtime_types.yaml
description: >
Run an instance of Tensorflow with GPU
diff --git a/single-vm/cloud_storage_service.yaml b/single-vm/cloud_storage_service.yaml
index effe9f2..354cf35 100644
--- a/single-vm/cloud_storage_service.yaml
+++ b/single-vm/cloud_storage_service.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/applications/storage_apps_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v3.3.0/tosca_types/applications/storage_apps_types.yaml
description: >
Deploy a cloud storage service
diff --git a/single-vm/elasticsearch_kibana.yaml b/single-vm/elasticsearch_kibana.yaml
index 0eac603..fe208aa 100644
--- a/single-vm/elasticsearch_kibana.yaml
+++ b/single-vm/elasticsearch_kibana.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/applications/elastic_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v3.3.0/tosca_types/applications/elastic_types.yaml
description: >
Deploy a virtual machine pre-configured with the Elasticsearch search and analytics engine and with Kibana for simple visualization of data with charts and graphs in Elasticsearch
diff --git a/single-vm/htcondor_mini.yaml b/single-vm/htcondor_mini.yaml
index 59ca3c7..6fd6b7c 100644
--- a/single-vm/htcondor_mini.yaml
+++ b/single-vm/htcondor_mini.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/applications/htcondor_mini_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v3.3.0/tosca_types/applications/htcondor_mini_types.yaml
description: Deploy HTCondor mini, a technology preview of an all-in-one ("minicondor") HTCondor. This type of install is useful for testing and experimentation.
diff --git a/single-vm/iam_voms-aa.yaml b/single-vm/iam_voms-aa.yaml
index d180477..99ba712 100644
--- a/single-vm/iam_voms-aa.yaml
+++ b/single-vm/iam_voms-aa.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/applications/iam_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v3.3.0/tosca_types/applications/iam_types.yaml
description: >
The on-demand deployment service for the INDIGO IAM provides a quick and easy way for organizations to deploy their own instance of the INDIGO IAM, which is an open-source Identity and Access Management system.
@@ -480,7 +480,7 @@ topology_template:
privacy_policy_url: { get_input: privacy_policy_url }
privacy_policy_text: { get_input: privacy_policy_text }
jwt_default_profile: { get_input: jwt_default_profile }
- docker_compose_file_url: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/artifacts/docker/iam/docker-compose.yml
+ docker_compose_file_url: https://baltig.infn.it/infn-cloud/tosca-types/raw/v3.3.0/artifacts/docker/iam/docker-compose.yml
environment_variables: { get_input: environment_variables }
server_ip: { get_attribute: [HOST, public_address, 0] }
dns_name: { concat: [get_attribute: [HOST, public_address, 0], ".", get_property: [ SELF, network_domain ]] }
diff --git a/single-vm/private-net/elasticsearch_kibana.yaml b/single-vm/private-net/elasticsearch_kibana.yaml
index fdadf41..5bb9d13 100644
--- a/single-vm/private-net/elasticsearch_kibana.yaml
+++ b/single-vm/private-net/elasticsearch_kibana.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/applications/elastic_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v3.3.0/tosca_types/applications/elastic_types.yaml
description: >
Deploy a virtual machine pre-configured with the Elasticsearch search and analytics engine and with Kibana for simple visualization of data with charts and graphs in Elasticsearch
diff --git a/single-vm/private-net/single_vm.yaml b/single-vm/private-net/single_vm.yaml
index 014076f..55adfaa 100644
--- a/single-vm/private-net/single_vm.yaml
+++ b/single-vm/private-net/single_vm.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/base/basic_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v3.3.0/tosca_types/base/basic_types.yaml
description: >
Launch a compute node getting the IP and SSH credentials to access via ssh
diff --git a/single-vm/private-net/single_vm_with_volume.yaml b/single-vm/private-net/single_vm_with_volume.yaml
index e32dbe1..6b62b41 100644
--- a/single-vm/private-net/single_vm_with_volume.yaml
+++ b/single-vm/private-net/single_vm_with_volume.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/base/basic_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v3.3.0/tosca_types/base/basic_types.yaml
description: >
Launch a compute node with attached volume and get the IP and SSH credentials to access via ssh
diff --git a/single-vm/single_vm.yaml b/single-vm/single_vm.yaml
index 228c7d4..7b03066 100644
--- a/single-vm/single_vm.yaml
+++ b/single-vm/single_vm.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/base/basic_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v3.3.0/tosca_types/base/basic_types.yaml
description: >
Launch a compute node getting the IP and SSH credentials to access via ssh
diff --git a/single-vm/single_vm_with_volume.yaml b/single-vm/single_vm_with_volume.yaml
index d74afb5..d14e215 100644
--- a/single-vm/single_vm_with_volume.yaml
+++ b/single-vm/single_vm_with_volume.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/CLOUD-1996/tosca_types/base/basic_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/raw/v3.3.0/tosca_types/base/basic_types.yaml
description: >
Launch a compute node with attached volume and get the IP and SSH credentials to access via ssh
--
GitLab
From 2a7c39e42540bc8235fe83646717c988030a5499 Mon Sep 17 00:00:00 2001
From: "gioacchino.vino" <gioacchino.vino@infn.it>
Date: Mon, 11 Dec 2023 18:03:01 +0100
Subject: [PATCH 05/11] New IAM client management
---
jupyter/cygno_experiment.yaml | 1 +
jupyter/jupyter_matlab.yaml | 1 +
jupyter/jupyter_vm.yaml | 1 +
jupyter/ml_infn.yaml | 1 +
single-vm/cloud_storage_service.yaml | 1 -
5 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/jupyter/cygno_experiment.yaml b/jupyter/cygno_experiment.yaml
index 8f2b6c8..ab7ea8c 100644
--- a/jupyter/cygno_experiment.yaml
+++ b/jupyter/cygno_experiment.yaml
@@ -113,6 +113,7 @@ topology_template:
type: tosca.nodes.indigo.iam.client
properties:
scopes: openid email profile wlcg offline_access address wlcg.groups
+ issuer: { get_input: iam_url }
ml_install:
type: tosca.nodes.DODAS.single-node-jupyterhub
diff --git a/jupyter/jupyter_matlab.yaml b/jupyter/jupyter_matlab.yaml
index 7b29735..94f3dbf 100644
--- a/jupyter/jupyter_matlab.yaml
+++ b/jupyter/jupyter_matlab.yaml
@@ -114,6 +114,7 @@ topology_template:
type: tosca.nodes.indigo.iam.client
properties:
scopes: openid email profile wlcg offline_access address wlcg.groups
+ issuer: { get_input: iam_url }
ml_install:
type: tosca.nodes.DODAS.single-node-jupyterhub
diff --git a/jupyter/jupyter_vm.yaml b/jupyter/jupyter_vm.yaml
index 2a601b3..78fec9c 100644
--- a/jupyter/jupyter_vm.yaml
+++ b/jupyter/jupyter_vm.yaml
@@ -128,6 +128,7 @@ topology_template:
type: tosca.nodes.indigo.iam.client
properties:
scopes: openid email profile wlcg offline_access address wlcg.groups
+ issuer: { get_input: iam_url }
ml_install:
type: tosca.nodes.DODAS.single-node-jupyterhub
diff --git a/jupyter/ml_infn.yaml b/jupyter/ml_infn.yaml
index 8eeca91..0cd04be 100644
--- a/jupyter/ml_infn.yaml
+++ b/jupyter/ml_infn.yaml
@@ -159,6 +159,7 @@ topology_template:
type: tosca.nodes.indigo.iam.client
properties:
scopes: openid email profile wlcg offline_access address wlcg.groups
+ issuer: { get_input: iam_url }
ml_install:
type: tosca.nodes.DODAS.single-node-jupyterhub
diff --git a/single-vm/cloud_storage_service.yaml b/single-vm/cloud_storage_service.yaml
index b99ce5b..33fde72 100644
--- a/single-vm/cloud_storage_service.yaml
+++ b/single-vm/cloud_storage_service.yaml
@@ -137,7 +137,6 @@ topology_template:
properties:
scopes: openid profile email
issuer: { get_input: iam_url }
- owner: { get_input: iam_subject }
s3_data_bucket:
type: tosca.nodes.indigo.S3Bucket
--
GitLab
From 3093ef035d9b3da9a0a8a127eace7219077d025a Mon Sep 17 00:00:00 2001
From: "gioacchino.vino" <gioacchino.vino@infn.it>
Date: Mon, 11 Dec 2023 18:03:21 +0100
Subject: [PATCH 06/11] Prepare Merge Request
--
GitLab
From 2f8a21737165dbdb16f85c25a0e60245f25140fc Mon Sep 17 00:00:00 2001
From: "gioacchino.vino" <gioacchino.vino@infn.it>
Date: Mon, 11 Dec 2023 18:04:32 +0100
Subject: [PATCH 07/11] New IAM client management
---
jupyter/private-net/jupyter_vm.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/jupyter/private-net/jupyter_vm.yaml b/jupyter/private-net/jupyter_vm.yaml
index 93191af..c5f39ea 100644
--- a/jupyter/private-net/jupyter_vm.yaml
+++ b/jupyter/private-net/jupyter_vm.yaml
@@ -122,6 +122,7 @@ topology_template:
type: tosca.nodes.indigo.iam.client
properties:
scopes: openid email profile wlcg offline_access address wlcg.groups
+ issuer: { get_input: iam_url }
ml_install:
type: tosca.nodes.DODAS.single-node-jupyterhub
--
GitLab
From 1d385a20eefe019d2170f08b08c7f2e0a1a6cdd2 Mon Sep 17 00:00:00 2001
From: "gioacchino.vino" <gioacchino.vino@infn.it>
Date: Mon, 11 Dec 2023 18:04:42 +0100
Subject: [PATCH 08/11] Prepare Merge Request
--
GitLab
From 10ea2e096d103bf6244f896315bc75acbe9b6404 Mon Sep 17 00:00:00 2001
From: "gioacchino.vino" <gioacchino.vino@infn.it>
Date: Mon, 11 Dec 2023 18:13:49 +0100
Subject: [PATCH 09/11] New IAM client management
---
jupyter/cygno_experiment.yaml | 2 +-
jupyter/jupyter_matlab.yaml | 2 +-
jupyter/jupyter_vm.yaml | 2 +-
jupyter/ml_infn.yaml | 2 +-
jupyter/private-net/jupyter_vm.yaml | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/jupyter/cygno_experiment.yaml b/jupyter/cygno_experiment.yaml
index ab7ea8c..67068e2 100644
--- a/jupyter/cygno_experiment.yaml
+++ b/jupyter/cygno_experiment.yaml
@@ -36,7 +36,7 @@ topology_template:
iam_url:
type: string
- default: "https://iam.cloud.infn.it"
+ default: "https://iam.cloud.infn.it/"
description: IAM Instance for end user authentication
iam_subject:
diff --git a/jupyter/jupyter_matlab.yaml b/jupyter/jupyter_matlab.yaml
index 94f3dbf..d985fc6 100644
--- a/jupyter/jupyter_matlab.yaml
+++ b/jupyter/jupyter_matlab.yaml
@@ -48,7 +48,7 @@ topology_template:
iam_url:
type: string
- default: "https://iam.cloud.infn.it"
+ default: "https://iam.cloud.infn.it/"
description: IAM Instance for end user authentication
iam_subject:
diff --git a/jupyter/jupyter_vm.yaml b/jupyter/jupyter_vm.yaml
index 78fec9c..5c1f4a0 100644
--- a/jupyter/jupyter_vm.yaml
+++ b/jupyter/jupyter_vm.yaml
@@ -50,7 +50,7 @@ topology_template:
iam_url:
type: string
- default: "https://iam.cloud.infn.it"
+ default: "https://iam.cloud.infn.it/"
description: IAM Instance for end user authentication
iam_subject:
diff --git a/jupyter/ml_infn.yaml b/jupyter/ml_infn.yaml
index 0cd04be..4e4f09b 100644
--- a/jupyter/ml_infn.yaml
+++ b/jupyter/ml_infn.yaml
@@ -69,7 +69,7 @@ topology_template:
iam_url:
type: string
- default: "https://iam.cloud.infn.it"
+ default: "https://iam.cloud.infn.it/"
description: IAM Instance for end user authentication
iam_subject:
diff --git a/jupyter/private-net/jupyter_vm.yaml b/jupyter/private-net/jupyter_vm.yaml
index c5f39ea..b864590 100644
--- a/jupyter/private-net/jupyter_vm.yaml
+++ b/jupyter/private-net/jupyter_vm.yaml
@@ -49,7 +49,7 @@ topology_template:
iam_url:
type: string
- default: "https://iam.cloud.infn.it"
+ default: "https://iam.cloud.infn.it/"
description: IAM Instance for end user authentication
iam_subject:
--
GitLab
From eedb9c9acea12c7d1f7d56ee848babc8fcafaf96 Mon Sep 17 00:00:00 2001
From: "gioacchino.vino" <gioacchino.vino@infn.it>
Date: Mon, 11 Dec 2023 18:14:02 +0100
Subject: [PATCH 10/11] Prepare Merge Request
--
GitLab
From 5179628d764f69ed54dbbccda3f4484f72713a0f Mon Sep 17 00:00:00 2001
From: "gioacchino.vino" <gioacchino.vino@infn.it>
Date: Tue, 12 Dec 2023 07:39:11 +0100
Subject: [PATCH 11/11] New IAM client management
---
jupyter/jupyter_matlab.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/jupyter/jupyter_matlab.yaml b/jupyter/jupyter_matlab.yaml
index d985fc6..88b4962 100644
--- a/jupyter/jupyter_matlab.yaml
+++ b/jupyter/jupyter_matlab.yaml
@@ -119,6 +119,7 @@ topology_template:
ml_install:
type: tosca.nodes.DODAS.single-node-jupyterhub
properties:
+ contact_email: { get_input: contact_email }
iam_client_id: { get_property : [ iam_client, client_id ] }
iam_token: { get_property : [ iam_client, registration_access_token ] }
#letsencrypt_test: false #Commented because not in tosca.nodes.DODAS.single-node-jupyterhub contact_email: { get_input: contact_email }
--
GitLab