(role/htcondor) update config and dry up tests

lsst-it · Apr 26, 2024 · f57a9f0 · f57a9f0
1 parent 5656bd5
commit f57a9f0
Show file tree

Hide file tree

Showing 5 changed files with 217 additions and 171 deletions.
diff --git a/hieradata/role/htcondor.yaml b/hieradata/role/htcondor.yaml
@@ -4,4 +4,13 @@ classes:
   - "profile::core::common"
   - "profile::core::nfsclient"
 
+packages:
+  - "nano"
+
+files:
+  /etc/profile.d/rubin.sh:
+    ensure: file
+    mode: "0600"
+    content: "export DAF_BUTLER_REPOSITORY_INDEX=/project/data-repos.yaml"
+
 htcondor::htcondor_version: "23.0"
diff --git a/hieradata/site/cp/role/htcondor.yaml b/hieradata/site/cp/role/htcondor.yaml
@@ -3,11 +3,31 @@ htcondor::htcondor_host: "htcondor-cm.cp.lsst.org"
 
 nfs::client_enabled: true
 nfs::client_mounts:
-  /mnt/project:
+  /project:
     share: "project"
     server: "nfs1.cp.lsst.org"
     atboot: true
-  /mnt/rsphome:
+  /rsphome:
     share: "rsphome"
     server: "nfs-rsphome.cp.lsst.org"
     atboot: true
+  /repo/LATISS:
+    share: "/auxtel/repo/LATISS"
+    server: "nfs-auxtel.cp.lsst.org"
+    atboot: true
+  /repo/LSSTComCam:
+    share: "/repo/LSSTComCam"
+    server: "comcam-archiver.cp.lsst.org"
+    atboot: true
+  /readonly/lsstdata/other:
+    share: "lsstdata"
+    server: "nfs1.cp.lsst.org"
+    atboot: true
+  /readonly/lsstdata/comcam:
+    share: "lsstdata"
+    server: "comcam-archiver.cp.lsst.org"
+    atboot: true
+  /readonly/lsstdata/auxtel:
+    share: "/auxtel/lsstdata"
+    server: "nfs-auxtel.cp.lsst.org"
+    atboot: true
diff --git a/hieradata/site/dev/role/htcondor.yaml b/hieradata/site/dev/role/htcondor.yaml
@@ -3,11 +3,11 @@ htcondor::htcondor_host: "htcondor-cm.dev.lsst.org"
 
 nfs::client_enabled: true
 nfs::client_mounts:
-  /mnt/project:
+  /project:
     share: "project"
     server: "nfs-project.ls.lsst.org"
     atboot: true
-  /mnt/rsphome:
+  /rsphome:
     share: "rsphome"
     server: "nfs-rsphome.ls.lsst.org"
     atboot: true
diff --git a/hieradata/site/ls/role/htcondor.yaml b/hieradata/site/ls/role/htcondor.yaml
@@ -3,11 +3,23 @@ htcondor::htcondor_host: "htcondor-cm.ls.lsst.org"
 
 nfs::client_enabled: true
 nfs::client_mounts:
-  /mnt/project:
+  /project:
     share: "project"
     server: "nfs-project.ls.lsst.org"
     atboot: true
-  /mnt/rsphome:
+  /rsphome:
     share: "rsphome"
     server: "nfs-rsphome.ls.lsst.org"
     atboot: true
+  /repo/LATISS:
+    share: "/auxtel/repo/LATISS"
+    server: "nfs-auxtel.ls.lsst.org"
+    atboot: true
+  /data/lsstdata/BTS/auxtel:
+    share: "/auxtel/lsstdata/BTS/auxtel"
+    server: "nfs-auxtel.ls.lsst.org"
+    atboot: true
+  /datasets:
+    share: "lsstdata"
+    server: "nfs-lsstdata.ls.lsst.org"
+    atboot: true