Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move vgcn-mounts.yml.j2 template from mounts repository to userdata.yaml.j2 #236

Merged
merged 1 commit into from
Nov 8, 2023

Conversation

kysrpex
Copy link
Contributor

@kysrpex kysrpex commented Nov 8, 2023

Move the contents of vgcn-mounts.yml.j2 from the mounts repository to userdata.yaml.j2.

Removes the need to call cd mounts; rm -f dest/*; make dest/vgcn-mounts.yml; cd .. in Jenkins, makes it possible to remove vgcn-mounts.yml and templates/vgcn-mounts.yml.j2 from the mounts repository.

Again, we did not do this in the past because userdata.yaml.j2 was not a Jinja template.

This is the rendered template:

[...]
  - content: |
      db        -hard,rw,nosuid,nconnect=2      ufr-dyn.isi1.public.ads.uni-freiburg.de:/ifs/isi1/ufr/bronze/nfs/denbi/&
      dp01      -hard,rw,nosuid,nconnect=2      denbi.svm.bwsfs.uni-freiburg.de:/dataplant01
      0 -hard,rw,nosuid,nconnect=2      denbi.svm.bwsfs.uni-freiburg.de:/dnb01/depot/&
      1 -hard,rw,nosuid,nconnect=2      denbi.svm.bwsfs.uni-freiburg.de:/dnb01/depot/&
      2 -hard,rw,nosuid,nconnect=2      denbi.svm.bwsfs.uni-freiburg.de:/dnb01/depot/&
      3 -hard,rw,nosuid,nconnect=2      denbi.svm.bwsfs.uni-freiburg.de:/dnb01/depot/&
      4 -hard,rw,nosuid,nconnect=2      denbi.svm.bwsfs.uni-freiburg.de:/dnb01/depot/&
      5 -hard,rw,nosuid,nconnect=2      denbi.svm.bwsfs.uni-freiburg.de:/dnb01/depot/&
      6 -hard,rw,nosuid,nconnect=2      denbi.svm.bwsfs.uni-freiburg.de:/dnb01/depot/&
      7 -hard,rw,nosuid,nconnect=2      denbi.svm.bwsfs.uni-freiburg.de:/dnb01/depot/&
      dnb-ds01  -hard,rw,nosuid,nconnect=2,nodev        denbi.svm.bwsfs.uni-freiburg.de:/dnb01-legacy
      dnb-ds02  -hard,rw,nosuid,nconnect=2,nodev        denbi.svm.bwsfs.uni-freiburg.de:/dnb02-legacy
      dnb-ds03  -hard,rw,nosuid,nconnect=2,nodev        denbi.svm.bwsfs.uni-freiburg.de:/dnb03-legacy
      dnb01     -hard,rw,nosuid,nconnect=2,nodev        ufr-dyn.isi1.public.ads.uni-freiburg.de:/ifs/isi1/ufr/bronze/nfs/denbi/&
      dnb02     -hard,rw,nosuid,nconnect=2,nodev        ufr-dyn.isi1.public.ads.uni-freiburg.de:/ifs/isi1/ufr/bronze/nfs/denbi/&
      dnb04     -hard,rw,nosuid,nconnect=2,nodev        ufr-dyn.isi1.public.ads.uni-freiburg.de:/ifs/isi1/ufr/bronze/nfs/denbi/&
      dnb05     -hard,rw,nosuid,nconnect=2,nodev        denbi.svm.bwsfs.uni-freiburg.de:/dnb01/&
      dnb06     -hard,rw,nosuid,nconnect=2,nodev        denbi.svm.bwsfs.uni-freiburg.de:/dnb06
      dnb07     -hard,rw,nosuid,nconnect=2,nodev        denbi.svm.bwsfs.uni-freiburg.de:/dnb07
      dnb08     -hard,rw,nosuid,nconnect=2,nodev        denbi.svm.bwsfs.uni-freiburg.de:/dnb08
      dnb09     -hard,rw,nosuid,nconnect=2,nodev        denbi.svm.bwsfs.uni-freiburg.de:/dnb09
      jwd       -hard,rw,nosuid,nconnect=2      denbi.svm.bwsfs.uni-freiburg.de:/ws01/&
      jwd01     -hard,rw,nosuid zfs1.galaxyproject.eu:/export/&
      jwd02f    -hard,rw,nosuid zfs2f.galaxyproject.eu:/export/&
      jwd03f    -hard,rw,nosuid,nconnect=2      denbi.svm.bwsfs.uni-freiburg.de:/ws02/&
      jwd04     -hard,rw,nosuid zfs3f.galaxyproject.eu:/export/&
      jwd05e    -hard,rw,nosuid zfs3f.galaxyproject.eu:/export/&
      birna01   -hard,rw,nosuid,nodev,nconnect=2        denbi.svm.bwsfs.uni-freiburg.de:/&
      
    owner: root:root
    path: /etc/auto.data
    permissions: "0644"
  - content: |
      /usr/local/tools      -hard,rw,nosuid,nconnect=2          denbi.svm.bwsfs.uni-freiburg.de:/dnb01/tools
      /opt/galaxy       -hard,rw,nosuid,nconnect=2      denbi.svm.bwsfs.uni-freiburg.de:/ws01/galaxy-sync/main
    owner: root:root
    path: /etc/auto.usrlocal
    permissions: "0644"

…aml.j2

Move the contents of vgcn-mounts.yml.j2 from the mounts repository to userdata.yaml.j2.

Removes the need to call `cd mounts; rm -f dest/*; make dest/vgcn-mounts.yml; cd  ..` in Jenkins, makes it possible to remove vgcn-mounts.yml and templates/vgcn-mounts.yml.j2 from the mounts repository.
@kysrpex kysrpex merged commit a65fbb4 into usegalaxy-eu:main Nov 8, 2023
2 checks passed
@kysrpex kysrpex deleted the move_mounts_template branch November 8, 2023 14:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants