From 90edf5397d25b959790f533f881eaf35190e35f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Wed, 30 Oct 2024 21:49:06 +0000
Subject: [PATCH] CVMFS on ENVRI-Hub
---
envri-hub/deploy.sh | 4 ++--
envri-hub/deployments/envri-hub.yaml | 12 ++++++------
envri-hub/inventory/1-envri-hub.yaml | 4 ++++
envri-hub/playbooks/cvmfs.yaml | 1 +
envri-hub/playbooks/squid.yaml | 1 +
envri-hub/playbooks/templates/etc/squid | 1 +
6 files changed, 15 insertions(+), 8 deletions(-)
create mode 120000 envri-hub/playbooks/cvmfs.yaml
create mode 120000 envri-hub/playbooks/squid.yaml
create mode 120000 envri-hub/playbooks/templates/etc/squid
diff --git a/envri-hub/deploy.sh b/envri-hub/deploy.sh
index 2e28826..8e5477e 100755
--- a/envri-hub/deploy.sh
+++ b/envri-hub/deploy.sh
@@ -19,8 +19,8 @@ ansible -m command -a 'uname -a' allnodes
ansible -m shell -a 'while ! test -f /var/lib/cloud/instance/boot-finished; do sleep 2; done' allnodes
# kubernetes
-# ansible-playbook playbooks/squid.yaml
-# ansible-playbook playbooks/cvmfs.yaml
+ansible-playbook playbooks/squid.yaml
+ansible-playbook playbooks/cvmfs.yaml
# wait for finish
# while ansible -m command -a 'kubectl get pods --all-namespaces' master | tail -n +3 | grep -Ev ' (Running|Completed) '; do sleep 5; done
diff --git a/envri-hub/deployments/envri-hub.yaml b/envri-hub/deployments/envri-hub.yaml
index 033d2d7..779550e 100644
--- a/envri-hub/deployments/envri-hub.yaml
+++ b/envri-hub/deployments/envri-hub.yaml
@@ -25,13 +25,13 @@ singleuser:
volumeNameTemplate: vol-{userid}{servername}
storageClass: csi-sc-cinderplugin
extraVolumes:
- # - name: cvmfs-host
- # hostPath:
- # path: /cvmfs
- # type: Directory
+ - name: cvmfs-host
+ hostPath:
+ path: /cvmfs
+ type: Directory
extraVolumeMounts:
- # - name: cvmfs-host
- # mountPath: "/cvmfs:shared"
+ - name: cvmfs-host
+ mountPath: "/cvmfs"
memory:
limit: 4G
guarantee: 128M
diff --git a/envri-hub/inventory/1-envri-hub.yaml b/envri-hub/inventory/1-envri-hub.yaml
index 4f6426c..cf6807f 100644
--- a/envri-hub/inventory/1-envri-hub.yaml
+++ b/envri-hub/inventory/1-envri-hub.yaml
@@ -5,9 +5,13 @@
ingress_0:
hosts:
+ # fake ingress for squid (CVMFS)
+ 10.0.0.70:
ingress:
hosts:
+ # fake ingress for squid (CVMFS
+ 10.0.0.70:
master:
hosts:
diff --git a/envri-hub/playbooks/cvmfs.yaml b/envri-hub/playbooks/cvmfs.yaml
new file mode 120000
index 0000000..2e82cca
--- /dev/null
+++ b/envri-hub/playbooks/cvmfs.yaml
@@ -0,0 +1 @@
+../../common/playbooks/cvmfs.yaml
\ No newline at end of file
diff --git a/envri-hub/playbooks/squid.yaml b/envri-hub/playbooks/squid.yaml
new file mode 120000
index 0000000..114c327
--- /dev/null
+++ b/envri-hub/playbooks/squid.yaml
@@ -0,0 +1 @@
+../../common/playbooks/squid.yaml
\ No newline at end of file
diff --git a/envri-hub/playbooks/templates/etc/squid b/envri-hub/playbooks/templates/etc/squid
new file mode 120000
index 0000000..352b598
--- /dev/null
+++ b/envri-hub/playbooks/templates/etc/squid
@@ -0,0 +1 @@
+../../../../common/playbooks/templates/etc/squid
\ No newline at end of file
--
GitLab