From a099d7a8d280f00cb4e937ac79a32d5fe34681e0 Mon Sep 17 00:00:00 2001 From: Jeff Ohrstrom Date: Thu, 30 Jan 2025 14:17:12 -0500 Subject: [PATCH] rm owens desktop, VDI and update VNC login host (#285) --- apps.awesim.org/apps/bc_desktop/owens.yml.erb | 106 ------------------ apps.awesim.org/apps/bc_desktop/vdi.yml | 4 +- apps.awesim.org/apps/dashboard/env | 3 +- apps.totalsim.us/apps/dashboard/env | 2 +- .../apps/bc_desktop/owens.yml.erb | 106 ------------------ ondemand.osc.edu/apps/bc_desktop/vdi.yml | 4 +- ondemand.osc.edu/apps/dashboard/env | 3 +- 7 files changed, 5 insertions(+), 223 deletions(-) delete mode 100644 apps.awesim.org/apps/bc_desktop/owens.yml.erb delete mode 100644 ondemand.osc.edu/apps/bc_desktop/owens.yml.erb diff --git a/apps.awesim.org/apps/bc_desktop/owens.yml.erb b/apps.awesim.org/apps/bc_desktop/owens.yml.erb deleted file mode 100644 index 250648b..0000000 --- a/apps.awesim.org/apps/bc_desktop/owens.yml.erb +++ /dev/null @@ -1,106 +0,0 @@ -<%- - groups = OodSupport::User.new.groups.sort_by(&:id).tap { |groups| - groups.unshift(groups.delete(OodSupport::Process.group)) - }.map(&:name).grep(/^P./) --%> ---- -title: "Owens Desktop" -cluster: "owens" -description: | - This app will launch an interactive desktop on one or more compute nodes. It is - a large environment for when you need a lot of compute and/or memory resources because - you will have full access to all the resources on that compute node(s). - - If you do not need all these resources, use the - [Lightweight Desktop](/pun/sys/dashboard/batch_connect/sys/bc_desktop/vdi/session_contexts/new) - app instead which is much more lightweight for general-purpose use cases. -form: - # everything is taken from bc_desktop/form.yml except cores is added - - bc_vnc_idle - - desktop - - account - - bc_num_hours - - cores - - gpus - - bc_num_slots - - licenses - - node_type - - bc_queue - - bc_vnc_resolution - - bc_email_on_started -attributes: - desktop: - widget: select - label: "Desktop environment" - options: - - ["Xfce", "xfce"] - - ["Mate", "mate"] - - ["Gnome", "gnome"] - help: | - This will launch either the [Xfce] or [Mate] desktop environment on the - [Owens cluster]. - - [Xfce]: https://xfce.org/ - [Mate]: https://mate-desktop.org/ - [Owens cluster]: https://www.osc.edu/resources/technical_support/supercomputers/owens - bc_queue: null - account: - label: "Project" - widget: select - options: - <%- groups.each do |group| %> - - "<%= group %>" - <%- end %> - cores: - widget: number_field - value: 28 - min: 1 - max: 28 - step: 1 - gpus: "" - licenses: - help: | - Licenses are comma separeated in the format '\@osc:\<# of licenses\>' like - 'stata@osc:1'. More help can be found on our website regarding the changes - in the [slurm migration]. - - [slurm migration]: https://www.osc.edu/resources/technical_support/supercomputers/owens/environment_changes_in_slurm_migration - pattern: '^([\w]+@osc:\d+,{0,1})+$' - node_type: - widget: select - label: "Node type" - help: | - - **any** - (*28 cores*) Chooses anyone of the available Owens nodes. - This reduces the wait time as you have no requirements. - - **vis** - (*28 cores*) This node includes an NVIDIA Tesla P100 GPU with - an X server running in the background. This allows for Hardware - Rendering with the GPU typically needed for 3D visualization using - VirtualGL. There are currently only 10 of these nodes on Owens. - - **gpu** - (*28 cores*) This node includes an NVIDIA Tesla P100 GPU - allowing for CUDA computations. There are currently only 160 of these - nodes on Owens. These nodes don't start an X server, so visualization - with hardware rendering is not possible. - - **hugemem** - (*48 cores*) This Owens node has 1.5TB of available RAM - as well as 48 cores. There are 16 of these nodes on Owens. - options: - - [ - "any", "any", - data-min-cores: 1, - data-max-cores: 28, - ] - - [ - "vis", "vis", - data-min-cores: 1, - data-max-cores: 28, - ] - - [ - "gpu", "gpu-any", - data-min-cores: 1, - data-max-cores: 28, - ] - - [ - "hugemem", "hugemem", - data-min-cores: 4, - data-max-cores: 48, - ] -submit: submit/slurm.yml.erb diff --git a/apps.awesim.org/apps/bc_desktop/vdi.yml b/apps.awesim.org/apps/bc_desktop/vdi.yml index a5ad36c..b7722c2 100644 --- a/apps.awesim.org/apps/bc_desktop/vdi.yml +++ b/apps.awesim.org/apps/bc_desktop/vdi.yml @@ -7,9 +7,8 @@ description: | You should be provisioned a desktop nearly immediately. If you need dedicated resources for compute or memory intensive workloads use a - Desktop app like [Owens], [Pitzer] or [Ascend] where you will have full access to them. + Desktop app like [Pitzer] or [Ascend] where you will have full access to them. - [Owens]: /pun/sys/dashboard/batch_connect/sys/bc_desktop/owens/session_contexts/new [Pitzer]: /pun/sys/dashboard/batch_connect/sys/bc_desktop/pitzer/session_contexts/new [Ascend]: /pun/sys/dashboard/batch_connect/sys/bc_desktop/ascend/session_contexts/new form: @@ -28,7 +27,6 @@ attributes: cluster: widget: select options: - - "owens" - "pitzer" - ["ascend", "ascend-login" ] - "cardinal" diff --git a/apps.awesim.org/apps/dashboard/env b/apps.awesim.org/apps/dashboard/env index f41148e..d516757 100644 --- a/apps.awesim.org/apps/dashboard/env +++ b/apps.awesim.org/apps/dashboard/env @@ -6,7 +6,7 @@ OOD_DASHBOARD_SUPPORT_URL="https://www.osc.edu/contact/client_support_request" OOD_DASHBOARD_SUPPORT_EMAIL="oschelp@osc.edu" ENABLE_NATIVE_VNC=1 -OOD_NATIVE_VNC_LOGIN_HOST=owens.osc.edu +OOD_NATIVE_VNC_LOGIN_HOST=pitzer.osc.edu DISABLE_SAFARI_BASIC_AUTH_WARNING=1 OOD_PORTAL="awesim" OOD_DASHBOARD_TITLE="AweSim Apps" @@ -20,7 +20,6 @@ OOD_DASHBOARD_DEV_DOCS_URL="https://github.com/AweSim-OSC/documentation/wiki/Dev OOD_APP_CATALOG_URL="https://www.awesim.org/en/products/" OOD_APP_SHARING=1 -OOD_DEV_SSH_HOST="apps-test.awesim.org" OOD_QUOTA_PATH=/users/reporting/storage/quota/netapp.netapp-home.ten.osc.edu-users_quota.json:/users/reporting/storage/quota/gpfs.project_quota.json:/users/reporting/storage/quota/gpfs.scratch_quota.json:/users/reporting/storage/quota/gpfs.ess_quota.json diff --git a/apps.totalsim.us/apps/dashboard/env b/apps.totalsim.us/apps/dashboard/env index 22a3a62..46d3474 100644 --- a/apps.totalsim.us/apps/dashboard/env +++ b/apps.totalsim.us/apps/dashboard/env @@ -6,7 +6,7 @@ OOD_DASHBOARD_SUPPORT_URL="mailto:app-support@totalsim.us" OOD_DASHBOARD_SUPPORT_EMAIL="app-support@totalsim.us" ENABLE_NATIVE_VNC=1 -OOD_NATIVE_VNC_LOGIN_HOST=owens.osc.edu +OOD_NATIVE_VNC_LOGIN_HOST=pitzer.osc.edu DISABLE_SAFARI_BASIC_AUTH_WARNING=1 OOD_PORTAL="awesim" OOD_DASHBOARD_TITLE="TotalSim Apps" diff --git a/ondemand.osc.edu/apps/bc_desktop/owens.yml.erb b/ondemand.osc.edu/apps/bc_desktop/owens.yml.erb deleted file mode 100644 index 250648b..0000000 --- a/ondemand.osc.edu/apps/bc_desktop/owens.yml.erb +++ /dev/null @@ -1,106 +0,0 @@ -<%- - groups = OodSupport::User.new.groups.sort_by(&:id).tap { |groups| - groups.unshift(groups.delete(OodSupport::Process.group)) - }.map(&:name).grep(/^P./) --%> ---- -title: "Owens Desktop" -cluster: "owens" -description: | - This app will launch an interactive desktop on one or more compute nodes. It is - a large environment for when you need a lot of compute and/or memory resources because - you will have full access to all the resources on that compute node(s). - - If you do not need all these resources, use the - [Lightweight Desktop](/pun/sys/dashboard/batch_connect/sys/bc_desktop/vdi/session_contexts/new) - app instead which is much more lightweight for general-purpose use cases. -form: - # everything is taken from bc_desktop/form.yml except cores is added - - bc_vnc_idle - - desktop - - account - - bc_num_hours - - cores - - gpus - - bc_num_slots - - licenses - - node_type - - bc_queue - - bc_vnc_resolution - - bc_email_on_started -attributes: - desktop: - widget: select - label: "Desktop environment" - options: - - ["Xfce", "xfce"] - - ["Mate", "mate"] - - ["Gnome", "gnome"] - help: | - This will launch either the [Xfce] or [Mate] desktop environment on the - [Owens cluster]. - - [Xfce]: https://xfce.org/ - [Mate]: https://mate-desktop.org/ - [Owens cluster]: https://www.osc.edu/resources/technical_support/supercomputers/owens - bc_queue: null - account: - label: "Project" - widget: select - options: - <%- groups.each do |group| %> - - "<%= group %>" - <%- end %> - cores: - widget: number_field - value: 28 - min: 1 - max: 28 - step: 1 - gpus: "" - licenses: - help: | - Licenses are comma separeated in the format '\@osc:\<# of licenses\>' like - 'stata@osc:1'. More help can be found on our website regarding the changes - in the [slurm migration]. - - [slurm migration]: https://www.osc.edu/resources/technical_support/supercomputers/owens/environment_changes_in_slurm_migration - pattern: '^([\w]+@osc:\d+,{0,1})+$' - node_type: - widget: select - label: "Node type" - help: | - - **any** - (*28 cores*) Chooses anyone of the available Owens nodes. - This reduces the wait time as you have no requirements. - - **vis** - (*28 cores*) This node includes an NVIDIA Tesla P100 GPU with - an X server running in the background. This allows for Hardware - Rendering with the GPU typically needed for 3D visualization using - VirtualGL. There are currently only 10 of these nodes on Owens. - - **gpu** - (*28 cores*) This node includes an NVIDIA Tesla P100 GPU - allowing for CUDA computations. There are currently only 160 of these - nodes on Owens. These nodes don't start an X server, so visualization - with hardware rendering is not possible. - - **hugemem** - (*48 cores*) This Owens node has 1.5TB of available RAM - as well as 48 cores. There are 16 of these nodes on Owens. - options: - - [ - "any", "any", - data-min-cores: 1, - data-max-cores: 28, - ] - - [ - "vis", "vis", - data-min-cores: 1, - data-max-cores: 28, - ] - - [ - "gpu", "gpu-any", - data-min-cores: 1, - data-max-cores: 28, - ] - - [ - "hugemem", "hugemem", - data-min-cores: 4, - data-max-cores: 48, - ] -submit: submit/slurm.yml.erb diff --git a/ondemand.osc.edu/apps/bc_desktop/vdi.yml b/ondemand.osc.edu/apps/bc_desktop/vdi.yml index a5ad36c..b7722c2 100644 --- a/ondemand.osc.edu/apps/bc_desktop/vdi.yml +++ b/ondemand.osc.edu/apps/bc_desktop/vdi.yml @@ -7,9 +7,8 @@ description: | You should be provisioned a desktop nearly immediately. If you need dedicated resources for compute or memory intensive workloads use a - Desktop app like [Owens], [Pitzer] or [Ascend] where you will have full access to them. + Desktop app like [Pitzer] or [Ascend] where you will have full access to them. - [Owens]: /pun/sys/dashboard/batch_connect/sys/bc_desktop/owens/session_contexts/new [Pitzer]: /pun/sys/dashboard/batch_connect/sys/bc_desktop/pitzer/session_contexts/new [Ascend]: /pun/sys/dashboard/batch_connect/sys/bc_desktop/ascend/session_contexts/new form: @@ -28,7 +27,6 @@ attributes: cluster: widget: select options: - - "owens" - "pitzer" - ["ascend", "ascend-login" ] - "cardinal" diff --git a/ondemand.osc.edu/apps/dashboard/env b/ondemand.osc.edu/apps/dashboard/env index f1f516b..13c15ea 100644 --- a/ondemand.osc.edu/apps/dashboard/env +++ b/ondemand.osc.edu/apps/dashboard/env @@ -6,7 +6,7 @@ OOD_DASHBOARD_SUPPORT_URL="https://www.osc.edu/contact/client_support_request" OOD_DASHBOARD_SUPPORT_EMAIL="oschelp@osc.edu" ENABLE_NATIVE_VNC=1 -OOD_NATIVE_VNC_LOGIN_HOST=owens.osc.edu +OOD_NATIVE_VNC_LOGIN_HOST=pitzer.osc.edu DISABLE_SAFARI_BASIC_AUTH_WARNING=1 OOD_DASHBOARD_TITLE="OSC OnDemand" @@ -18,7 +18,6 @@ OOD_DASHBOARD_PASSWD_URL="https://my.osc.edu" # show all apps index page SHOW_ALL_APPS_LINK=1 -OOD_DEV_SSH_HOST="ondemand-test.osc.edu" # enable quota feature OOD_QUOTA_PATH=/users/reporting/storage/quota/netapp.netapp-home.ten.osc.edu-users_quota.json:/users/reporting/storage/quota/gpfs.project_quota.json:/users/reporting/storage/quota/gpfs.scratch_quota.json:/users/reporting/storage/quota/gpfs.ess_quota.json