Misc updates to support cardinal (#261)

Misc updates to support cardinal. Really this just adds a cardinal desktop while refactoring the vdi to use auto_accounts instead of parsing ERB. cardinal VDI is on hold for a second while we create an image for it.
OSC · Oct 3, 2024 · b1e1e02 · b1e1e02
1 parent d5d7506
commit b1e1e02
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 32 deletions.
diff --git a/apps.awesim.org/apps/bc_desktop/submit/vdi.yml.erb b/apps.awesim.org/apps/bc_desktop/submit/vdi.yml.erb
@@ -15,13 +15,12 @@ batch_connect:
     export SLURM_EXPORT_ENV=ALL
 
 script:
-  accounting_id: "<%= account %>"
   job_environment:
     XDG_RUNTIME_DIR: "/tmp/xdg_runtime"
     SINGULARITY_ENVXDG_RUNTIME_DIR: "/tmp/xdg_runtime"
     APPTAINER_ENVXDG_RUNTIME_DIR: "/tmp/xdg_runtime"
   native:
-    <%- if cluster == 'ascend-login' -%>
+    <%- if ['ascend-login', 'cardinal-login'].include?(cluster) -%>
     singularity_container: "/apps/project/ondemand/singularity/mate-rhel8/mate-rhel8.sif"
     singularity_bindpath: "/run,/apps"
     <%- else -%>

diff --git a/apps.awesim.org/apps/bc_desktop/vdi.yml.erb → apps.awesim.org/apps/bc_desktop/vdi.yml b/apps.awesim.org/apps/bc_desktop/vdi.yml.erb → apps.awesim.org/apps/bc_desktop/vdi.yml
@@ -1,8 +1,3 @@
-<%-
-  groups = OodSupport::User.new.groups.sort_by(&:id).tap { |groups|
-    groups.unshift(groups.delete(OodSupport::Process.group))
-  }.map(&:name).grep(/^P./)
--%>
 ---
 title: "Lightweight Desktop"
 description: |
@@ -21,7 +16,7 @@ form:
   - cluster
   - bc_vnc_idle
   - desktop
-  - account
+  - auto_accounts
   - bc_num_hours
   - bc_num_slots
   - licenses
@@ -65,13 +60,6 @@ attributes:
     pattern: '^([\w]+@osc:\d+,{0,1})+$'
   node_type: ":ppn=1"
   bc_email_on_started: 0
-  account:
-    label: "Project"
-    widget: select
-    options:
-      <%- groups.each do |group| %>
-      - "<%= group %>"
-      <%- end %>
   bc_vnc_idle: 0
   bc_vnc_resolution:
     required: true

diff --git a/apps.awesim.org/apps/shell/env b/apps.awesim.org/apps/shell/env
@@ -1,3 +1,3 @@
 DEFAULT_SSHHOST=owens.osc.edu
 OOD_DEFAULT_SSHHOST=owens.osc.edu
-OOD_SSHHOST_ALLOWLIST="a[0-1][0-9][0-9][0-9].ten.osc.edu:o[0-1][0-9][0-9][0-9].ten.osc.edu:p[0-1][0-9][0-9][0-9].ten.osc.edu:apps-test.awesim.org"
+OOD_SSHHOST_ALLOWLIST="a[0-1][0-9][0-9][0-9].ten.osc.edu:o[0-1][0-9][0-9][0-9].ten.osc.edu:p[0-1][0-9][0-9][0-9].ten.osc.edu:c[0-1][0-9][0-9][0-9].ten.osc.edu"
diff --git a/ondemand.osc.edu/apps/bc_desktop/submit/vdi.yml.erb b/ondemand.osc.edu/apps/bc_desktop/submit/vdi.yml.erb
@@ -15,13 +15,12 @@ batch_connect:
     export SLURM_EXPORT_ENV=ALL
 
 script:
-  accounting_id: "<%= account %>"
   job_environment:
     XDG_RUNTIME_DIR: "/tmp/xdg_runtime"
     SINGULARITY_ENVXDG_RUNTIME_DIR: "/tmp/xdg_runtime"
     APPTAINER_ENVXDG_RUNTIME_DIR: "/tmp/xdg_runtime"
   native:
-    <%- if cluster == 'ascend-login' -%>
+    <%- if ['ascend-login', 'cardinal-login'].include?(cluster) -%>
     singularity_container: "/apps/project/ondemand/singularity/mate-rhel8/mate-rhel8.sif"
     singularity_bindpath: "/run,/apps"
     <%- else -%>

diff --git a/ondemand.osc.edu/apps/bc_desktop/vdi.yml.erb → ondemand.osc.edu/apps/bc_desktop/vdi.yml b/ondemand.osc.edu/apps/bc_desktop/vdi.yml.erb → ondemand.osc.edu/apps/bc_desktop/vdi.yml
@@ -1,8 +1,3 @@
-<%-
-  groups = OodSupport::User.new.groups.sort_by(&:id).tap { |groups|
-    groups.unshift(groups.delete(OodSupport::Process.group))
-  }.map(&:name).grep(/^P./)
--%>
 ---
 title: "Lightweight Desktop"
 description: |
@@ -21,7 +16,7 @@ form:
   - cluster
   - bc_vnc_idle
   - desktop
-  - account
+  - auto_accounts
   - bc_num_hours
   - bc_num_slots
   - licenses
@@ -65,13 +60,6 @@ attributes:
     pattern: '^([\w]+@osc:\d+,{0,1})+$'
   node_type: ":ppn=1"
   bc_email_on_started: 0
-  account:
-    label: "Project"
-    widget: select
-    options:
-      <%- groups.each do |group| %>
-      - "<%= group %>"
-      <%- end %>
   bc_vnc_idle: 0
   bc_vnc_resolution:
     required: true

diff --git a/ondemand.osc.edu/apps/shell/env b/ondemand.osc.edu/apps/shell/env
@@ -1,3 +1,3 @@
 DEFAULT_SSHHOST=owens.osc.edu
 OOD_DEFAULT_SSHHOST=owens.osc.edu
-OOD_SSHHOST_ALLOWLIST="a[0-1][0-9][0-9][0-9].ten.osc.edu:o[0-1][0-9][0-9][0-9].ten.osc.edu:p[0-1][0-9][0-9][0-9].ten.osc.edu:ondemand-test.osc.edu"
+OOD_SSHHOST_ALLOWLIST="a[0-1][0-9][0-9][0-9].ten.osc.edu:o[0-1][0-9][0-9][0-9].ten.osc.edu:p[0-1][0-9][0-9][0-9].ten.osc.edu:c[0-1][0-9][0-9][0-9].ten.osc.edu"