From 9534ab2272d7347a53f9471302254a47f0f2700e Mon Sep 17 00:00:00 2001
From: Jeff Ohrstrom <johrstrom@osc.edu>
Date: Mon, 30 Sep 2024 11:05:43 -0400
Subject: [PATCH 1/7] change this file extension

---
 ondemand.osc.edu/apps/bc_desktop/{vdi.yml.erb => vdi.yml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename ondemand.osc.edu/apps/bc_desktop/{vdi.yml.erb => vdi.yml} (100%)

diff --git a/ondemand.osc.edu/apps/bc_desktop/vdi.yml.erb b/ondemand.osc.edu/apps/bc_desktop/vdi.yml
similarity index 100%
rename from ondemand.osc.edu/apps/bc_desktop/vdi.yml.erb
rename to ondemand.osc.edu/apps/bc_desktop/vdi.yml

From ef30cdfedce18d87eec91e4596fa09c78e0e4df2 Mon Sep 17 00:00:00 2001
From: Jeff Ohrstrom <johrstrom@osc.edu>
Date: Mon, 30 Sep 2024 11:08:08 -0400
Subject: [PATCH 2/7] udpate ondemand

---
 .../apps/bc_desktop/submit/vdi.yml.erb             |  3 +--
 ondemand.osc.edu/apps/bc_desktop/vdi.yml           | 14 +-------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/ondemand.osc.edu/apps/bc_desktop/submit/vdi.yml.erb b/ondemand.osc.edu/apps/bc_desktop/submit/vdi.yml.erb
index 2b9d96c..35ac57e 100644
--- 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 b/ondemand.osc.edu/apps/bc_desktop/vdi.yml
index 7242ffc..a3b5fbc 100644
--- a/ondemand.osc.edu/apps/bc_desktop/vdi.yml
+++ b/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

From 74eac56c256e1da0f142769811c422a2b915f165 Mon Sep 17 00:00:00 2001
From: Jeff Ohrstrom <johrstrom@osc.edu>
Date: Mon, 30 Sep 2024 11:08:45 -0400
Subject: [PATCH 3/7] change this files extension

---
 apps.awesim.org/apps/bc_desktop/{vdi.yml.erb => vdi.yml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename apps.awesim.org/apps/bc_desktop/{vdi.yml.erb => vdi.yml} (100%)

diff --git a/apps.awesim.org/apps/bc_desktop/vdi.yml.erb b/apps.awesim.org/apps/bc_desktop/vdi.yml
similarity index 100%
rename from apps.awesim.org/apps/bc_desktop/vdi.yml.erb
rename to apps.awesim.org/apps/bc_desktop/vdi.yml

From f3fb0788a0be34a9ac2303b38c1955ee0d076cfc Mon Sep 17 00:00:00 2001
From: Jeff Ohrstrom <johrstrom@osc.edu>
Date: Mon, 30 Sep 2024 11:09:48 -0400
Subject: [PATCH 4/7] add cardinal vdi

---
 apps.awesim.org/apps/bc_desktop/submit/vdi.yml.erb |  3 +--
 apps.awesim.org/apps/bc_desktop/vdi.yml            | 14 +-------------
 2 files changed, 2 insertions(+), 15 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
index 2b9d96c..35ac57e 100644
--- 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 b/apps.awesim.org/apps/bc_desktop/vdi.yml
index 7242ffc..a3b5fbc 100644
--- a/apps.awesim.org/apps/bc_desktop/vdi.yml
+++ b/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

From fd9e85d352a176e75f6b00aec36b75caec536dbd Mon Sep 17 00:00:00 2001
From: Jeff Ohrstrom <johrstrom@osc.edu>
Date: Mon, 30 Sep 2024 11:16:39 -0400
Subject: [PATCH 5/7] actually add cardinal

---
 apps.awesim.org/apps/bc_desktop/vdi.yml  | 1 +
 ondemand.osc.edu/apps/bc_desktop/vdi.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/apps.awesim.org/apps/bc_desktop/vdi.yml b/apps.awesim.org/apps/bc_desktop/vdi.yml
index a3b5fbc..5f9bea9 100644
--- a/apps.awesim.org/apps/bc_desktop/vdi.yml
+++ b/apps.awesim.org/apps/bc_desktop/vdi.yml
@@ -31,6 +31,7 @@ attributes:
       - "owens"
       - "pitzer"
       - ["ascend", "ascend-login" ]
+      - ["cardinal", "cardinal-login" ]
   desktop:
     widget: select
     label: "Desktop environment"
diff --git a/ondemand.osc.edu/apps/bc_desktop/vdi.yml b/ondemand.osc.edu/apps/bc_desktop/vdi.yml
index a3b5fbc..5f9bea9 100644
--- a/ondemand.osc.edu/apps/bc_desktop/vdi.yml
+++ b/ondemand.osc.edu/apps/bc_desktop/vdi.yml
@@ -31,6 +31,7 @@ attributes:
       - "owens"
       - "pitzer"
       - ["ascend", "ascend-login" ]
+      - ["cardinal", "cardinal-login" ]
   desktop:
     widget: select
     label: "Desktop environment"

From 81e4ab67dd03fdd6657575f2c225b3eb1c53e849 Mon Sep 17 00:00:00 2001
From: Jeff Ohrstrom <johrstrom@osc.edu>
Date: Thu, 3 Oct 2024 16:08:35 -0400
Subject: [PATCH 6/7] add cardinal to shell allowlist

---
 apps.awesim.org/apps/shell/env  | 2 +-
 ondemand.osc.edu/apps/shell/env | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps.awesim.org/apps/shell/env b/apps.awesim.org/apps/shell/env
index db705c1..219c38c 100644
--- 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/shell/env b/ondemand.osc.edu/apps/shell/env
index cc99e2f..219c38c 100644
--- 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"

From 9b1cb7b08c18f66229613d54926f2808179e0dbd Mon Sep 17 00:00:00 2001
From: Jeff Ohrstrom <johrstrom@osc.edu>
Date: Thu, 3 Oct 2024 16:09:23 -0400
Subject: [PATCH 7/7] remove cardinal from vdi for now

---
 apps.awesim.org/apps/bc_desktop/vdi.yml  | 1 -
 ondemand.osc.edu/apps/bc_desktop/vdi.yml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/apps.awesim.org/apps/bc_desktop/vdi.yml b/apps.awesim.org/apps/bc_desktop/vdi.yml
index 5f9bea9..a3b5fbc 100644
--- a/apps.awesim.org/apps/bc_desktop/vdi.yml
+++ b/apps.awesim.org/apps/bc_desktop/vdi.yml
@@ -31,7 +31,6 @@ attributes:
       - "owens"
       - "pitzer"
       - ["ascend", "ascend-login" ]
-      - ["cardinal", "cardinal-login" ]
   desktop:
     widget: select
     label: "Desktop environment"
diff --git a/ondemand.osc.edu/apps/bc_desktop/vdi.yml b/ondemand.osc.edu/apps/bc_desktop/vdi.yml
index 5f9bea9..a3b5fbc 100644
--- a/ondemand.osc.edu/apps/bc_desktop/vdi.yml
+++ b/ondemand.osc.edu/apps/bc_desktop/vdi.yml
@@ -31,7 +31,6 @@ attributes:
       - "owens"
       - "pitzer"
       - ["ascend", "ascend-login" ]
-      - ["cardinal", "cardinal-login" ]
   desktop:
     widget: select
     label: "Desktop environment"