From aa56235278405d811b9fafae86f589e09ab36f0e Mon Sep 17 00:00:00 2001
From: Marica Antonacci <marica.antonacci@ba.infn.it>
Date: Wed, 21 Dec 2022 18:19:36 +0100
Subject: [PATCH 1/8] Add htcondor mini template
---
docker/docker_compose.yaml | 2 +-
docker/htcondor_mini.yaml | 103 +++++++++++++++++++++++++++++++++++++
2 files changed, 104 insertions(+), 1 deletion(-)
create mode 100644 docker/htcondor_mini.yaml
diff --git a/docker/docker_compose.yaml b/docker/docker_compose.yaml
index 9f940c5..8fd3d9a 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/master/tosca_types/infrastructure/docker_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/-/raw/update_compose_version/tosca_types/infrastructure/docker_types.yaml
description: >
Deploy a virtual machine with docker engine and docker-compose pre-installed.
diff --git a/docker/htcondor_mini.yaml b/docker/htcondor_mini.yaml
new file mode 100644
index 0000000..9b48ed0
--- /dev/null
+++ b/docker/htcondor_mini.yaml
@@ -0,0 +1,103 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+imports:
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/-/raw/master/tosca_types/infrastructure/docker_types.yaml
+
+description: Start htcondor playground
+
+metadata:
+ display_name: HTCondor playground
+
+topology_template:
+
+ inputs:
+
+ num_cpus:
+ type: integer
+ description: Number of virtual cpus for the VM
+ default: 1
+
+ mem_size:
+ type: scalar-unit.size
+ description: Amount of memory for the VM
+ default: 2 GB
+
+ image_tag:
+ type: string
+ description: "Tag of the image htcondor/mini"
+ default: 10.0.0-el7
+
+ users:
+ type: list
+ description: list of users to create on the VM
+ entry_schema:
+ type: tosca.datatypes.indigo.User
+ default: []
+ required: false
+
+ node_templates:
+
+ pub_network:
+ type: tosca.nodes.network.Network
+ properties:
+ network_type: public
+
+ server_pub_port:
+ type: tosca.nodes.network.Port
+ properties:
+ order: 1
+ requirements:
+ - binding: server
+ - link: pub_network
+
+ priv_network:
+ type: tosca.nodes.network.Network
+ properties:
+ network_type: private
+
+ server_priv_port:
+ type: tosca.nodes.network.Port
+ properties:
+ order: 0
+ requirements:
+ - binding: server
+ - link: priv_network
+
+ server:
+ type: tosca.nodes.indigo.Compute
+ properties:
+ os_users: { get_input: users }
+ capabilities:
+ endpoint:
+ properties:
+ ports: { "htcondor": {"protocol": "tcp", "source": 9618} }
+ scalable:
+ properties:
+ count: 1
+ host:
+ properties:
+ num_cpus: { get_input: num_cpus }
+ mem_size: { get_input: mem_size }
+ os:
+ properties:
+ distribution: ubuntu
+ version: 20.04
+ type: linux
+
+ htcondor_mini:
+ type: tosca.nodes.indigo.dockerRun
+ properties:
+ docker_appname: mini
+ docker_image: htcondor/mini
+ docker_tag: { get_input: image_tag }
+ docker_ports: [ "9618:9618" ]
+ requirements:
+ - host: server
+
+ outputs:
+ node_ip:
+ value: { get_attribute: [ server, public_address, 0 ] }
+ node_creds:
+ value: { get_attribute: [ server, endpoint, credential, 0 ] }
+ os_users:
+ value: { get_property: [ server, os_users, 0 ] }
--
GitLab
From 34d44300873352ffa8d604063a2d659a67f95d0d Mon Sep 17 00:00:00 2001
From: Francesco Sinisi <francesco.sinisi@cnaf.infn.it>
Date: Mon, 23 Jan 2023 11:22:06 +0100
Subject: [PATCH 2/8] changed reference tosca-type
---
docker/docker_compose.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docker/docker_compose.yaml b/docker/docker_compose.yaml
index 8fd3d9a..9f940c5 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/update_compose_version/tosca_types/infrastructure/docker_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/-/raw/master/tosca_types/infrastructure/docker_types.yaml
description: >
Deploy a virtual machine with docker engine and docker-compose pre-installed.
--
GitLab
From ca9aa84ac49e833d60828a1bf676c8ab8056bf4d Mon Sep 17 00:00:00 2001
From: Francesco Sinisi <francesco.sinisi@cnaf.infn.it>
Date: Mon, 23 Jan 2023 11:23:41 +0100
Subject: [PATCH 3/8] changed image tag
---
docker/htcondor_mini.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docker/htcondor_mini.yaml b/docker/htcondor_mini.yaml
index 9b48ed0..c5a387b 100644
--- a/docker/htcondor_mini.yaml
+++ b/docker/htcondor_mini.yaml
@@ -25,7 +25,7 @@ topology_template:
image_tag:
type: string
description: "Tag of the image htcondor/mini"
- default: 10.0.0-el7
+ default: 10.0.0-ubu20.04
users:
type: list
--
GitLab
From aaee202d586ce0ad095a962cf5e56c4e197fb4f2 Mon Sep 17 00:00:00 2001
From: Francesco Sinisi <francesco.sinisi@cnaf.infn.it>
Date: Fri, 3 Mar 2023 15:08:50 +0100
Subject: [PATCH 4/8] Update htcondor_mini.yaml
---
docker/htcondor_mini.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docker/htcondor_mini.yaml b/docker/htcondor_mini.yaml
index c5a387b..9b48ed0 100644
--- a/docker/htcondor_mini.yaml
+++ b/docker/htcondor_mini.yaml
@@ -25,7 +25,7 @@ topology_template:
image_tag:
type: string
description: "Tag of the image htcondor/mini"
- default: 10.0.0-ubu20.04
+ default: 10.0.0-el7
users:
type: list
--
GitLab
From d8d4463d15c06af7bee8862b1c47f51b412fd05f Mon Sep 17 00:00:00 2001
From: Francesco Sinisi <francesco.sinisi@cnaf.infn.it>
Date: Fri, 3 Mar 2023 18:34:53 +0100
Subject: [PATCH 5/8] Update htcondor_mini.yaml
---
docker/htcondor_mini.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docker/htcondor_mini.yaml b/docker/htcondor_mini.yaml
index 9b48ed0..82ed99a 100644
--- a/docker/htcondor_mini.yaml
+++ b/docker/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/master/tosca_types/infrastructure/docker_types.yaml
+ - indigo_custom_types: https://baltig.infn.it/infn-cloud/tosca-types/-/raw/htcondor_mini/tosca_types/infrastructure/htcondor_mini_types.yaml
description: Start htcondor playground
--
GitLab
From 167125528c1605b129d7944315b03425d63ea43c Mon Sep 17 00:00:00 2001
From: Francesco Sinisi <francesco.sinisi@cnaf.infn.it>
Date: Thu, 9 Mar 2023 19:47:15 +0100
Subject: [PATCH 6/8] Update htcondor_mini.yaml
---
docker/htcondor_mini.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/docker/htcondor_mini.yaml b/docker/htcondor_mini.yaml
index 82ed99a..91c8d70 100644
--- a/docker/htcondor_mini.yaml
+++ b/docker/htcondor_mini.yaml
@@ -87,6 +87,7 @@ topology_template:
htcondor_mini:
type: tosca.nodes.indigo.dockerRun
properties:
+ os_users: { get_input: users }
docker_appname: mini
docker_image: htcondor/mini
docker_tag: { get_input: image_tag }
--
GitLab
From 66359a7ebbc6f46b0c379a5b6f86a6bf56b2be12 Mon Sep 17 00:00:00 2001
From: Francesco Sinisi <francesco.sinisi@cnaf.infn.it>
Date: Wed, 15 Mar 2023 16:59:17 +0100
Subject: [PATCH 7/8] Update htcondor_mini.yaml
---
docker/htcondor_mini.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docker/htcondor_mini.yaml b/docker/htcondor_mini.yaml
index 91c8d70..a858302 100644
--- a/docker/htcondor_mini.yaml
+++ b/docker/htcondor_mini.yaml
@@ -85,7 +85,7 @@ topology_template:
type: linux
htcondor_mini:
- type: tosca.nodes.indigo.dockerRun
+ type: tosca.nodes.indigo.dockerRun.htcondormini
properties:
os_users: { get_input: users }
docker_appname: mini
--
GitLab
From daeec79a634bafa2994c4798d73e6a03d6879c17 Mon Sep 17 00:00:00 2001
From: Francesco Sinisi <francesco.sinisi@cnaf.infn.it>
Date: Wed, 15 Mar 2023 18:23:52 +0100
Subject: [PATCH 8/8] Update htcondor_mini.yaml
---
docker/htcondor_mini.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docker/htcondor_mini.yaml b/docker/htcondor_mini.yaml
index a858302..1d6cfda 100644
--- a/docker/htcondor_mini.yaml
+++ b/docker/htcondor_mini.yaml
@@ -85,7 +85,7 @@ topology_template:
type: linux
htcondor_mini:
- type: tosca.nodes.indigo.dockerRun.htcondormini
+ type: tosca.nodes.indigo.htcondorMini
properties:
os_users: { get_input: users }
docker_appname: mini
--
GitLab