diff --git a/envri-hub/deploy.sh b/envri-hub/deploy.sh index 2e288265cfeda2b3a5d126473d9d9a79a42db944..8e5477ebdacec92d565aba89aebda35f0a349eb1 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 033d2d763b6d16e5d695a2c95bc3e2628a1d4a74..779550e15cbd3edfcc1ad2b6523c903ca246f1ac 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 4f6426c9963da1f9bb63ee7b85e90f283d7b17ff..cf6807f84a06a0144b1a023420de8c9017fc9960 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 0000000000000000000000000000000000000000..2e82cca6c387556209aad5ff66ea41eba8f28082 --- /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 0000000000000000000000000000000000000000..114c327c31c35f2362f124c93f50c31d9e28b589 --- /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 0000000000000000000000000000000000000000..352b5984beddb28543e7e6e2a84e5d5152a155ec --- /dev/null +++ b/envri-hub/playbooks/templates/etc/squid @@ -0,0 +1 @@ +../../../../common/playbooks/templates/etc/squid \ No newline at end of file