From 997fa7a89abff1a2d080c9ef28174ff1f2c193d1 Mon Sep 17 00:00:00 2001
From: madmax-codewarrior-0
 <58088316+madmax-codewarrior-0@users.noreply.github.com>
Date: Thu, 23 Feb 2023 14:48:47 -0800
Subject: [PATCH] Update provides and addons; Update/enhance operating systems;
 Add OpenStack instance flavors

---
 content/hub/oregonstateuniversity.md          | 101 ++++++++++++++++--
 .../layouts/partials/hubform.html             |  52 ++++++---
 2 files changed, 129 insertions(+), 24 deletions(-)

diff --git a/content/hub/oregonstateuniversity.md b/content/hub/oregonstateuniversity.md
index b8d0fe8..c533b61 100644
--- a/content/hub/oregonstateuniversity.md
+++ b/content/hub/oregonstateuniversity.md
@@ -1,21 +1,106 @@
 ---
-title: OSU Open Source Lab
+title: Oregon State University Open Source Lab
 member: oregonstateuniversity
 projects:
   - Open Source
 provides:
-  - Bare Metal
-  - Virtual Machine
-  - Container
+  - Bare Metal Machine (coming soon)
+  - Virtual Machine (via OpenStack; with GPU)
+  - Container (via OpenShift; with FPGA; coming soon)
 addons:
   - none
-  - GPU (vm)
-  - FPGA (container)
+  - Nvidia V100 GPU (VM)
+  - OpenCAPI Alpha Data 9H3 FPGA (container)
 systems:
   - POWER9
+opnstkflavors:
+  standard:
+    - name: "oph.c1m4.d20"
+      cpus: 1
+      memory: 4
+      gpus: "-"
+      disk: 20 
+    - name: "oph.c2m8.d20"
+      cpus: 2
+      memory: 8
+      gpus: "-"
+      disk: 20
+    - name: "oph.c4m12.d40"
+      cpus: 4
+      memory: 12
+      gpus: "-"
+      disk: 40
+    - name: "oph.c8m16.d80"
+      cpus: 8
+      memory: 16
+      gpus: "-"
+      disk: 80
+    - name: "oph.c16m32.d120"
+      cpus: 16
+      memory: 32
+      gpus: "-"
+      disk: 120
+    - name: "oph.c32m64.d240"
+      cpus: 32
+      memory: 64
+      gpus: "-"
+      disk: 240
+    - name: "oph.c64m128.d240"
+      cpus: 64
+      memory: 128
+      gpus: "-"
+      disk: 240
+  gpuenabled:
+    - name: "oph.c8m16.g1.d120"
+      cpus: 8
+      memory: 16
+      gpus: 1
+      disk: 120
+    - name: "oph.c16m32.g1.d120"
+      cpus: 16
+      memory: 32
+      gpus: 1
+      disk: 120
+    - name: "oph.c16m32.g2.d120"
+      cpus: 16
+      memory: 32
+      gpus: 2
+      disk: 120
+    - name: "oph.c32m64.g2.d240"
+      cpus: 32
+      memory: 64
+      gpus: 2
+      disk: 240
+    - name: "oph.c64m128.g2.d240"
+      cpus: 64
+      memory: 128
+      gpus: 2
+      disk: 240
 operatingsystems:
-  - CentOS
-  - Ubuntu
+  available:
+    standard: 
+      - CentOS Stream 8
+      - CentOS Stream 9
+      - Debian 10
+      - Debian 11
+      - Fedora [latest]
+      - Ubuntu 18.04
+      - Ubuntu 20.04
+      - Ubuntu 22.04
+    gpuenabled:
+      - CentOS Stream 8
+      - CentOS Stream 9
+      - Ubuntu 20.04
+      - Ubuntu 22.04
+  unavailable:
+    standard:
+      - Alma Linux 8
+      - Alma Linux 9
+      - Rocky Linux 9
+    gpuenabled:  
+      - Alma Linux 8
+      - Alma Linux 9
+      - Rocky Linux 9
 weight: -9000
 date: 2022-08-24
 draft: false
diff --git a/themes/openpowerfoundation/layouts/partials/hubform.html b/themes/openpowerfoundation/layouts/partials/hubform.html
index 10b5836..0a66d27 100644
--- a/themes/openpowerfoundation/layouts/partials/hubform.html
+++ b/themes/openpowerfoundation/layouts/partials/hubform.html
@@ -46,60 +46,80 @@ var goal = "{{ .Site.Params.forms.hub.goal }}";
 				</div>
 			</div>
 			<div class="form-row">
-				{{ $projects := .Param "projects" }}
-				{{ if $projects }}
+				{{ if .Param "projects" }}
 					<div class="form-group col-lg-6">
 						What is your project?
 						<select id="projecttype" name="projecttype">
-						{{ range $projects }}
+						{{ range .Param "projects" }}
 							<option value="{{ . }}">{{ . }}</option>
 						{{ end }}
 						</select>
 					</div>
 				{{ end }}
-				{{ $systems := .Param "systems" }}
-				{{ if $systems }}
+				{{ if .Param "systems" }}
 					<div class="form-group col-lg-6">
 						What POWER system would you like?
 						<select id="system" name="system">
-						{{ range $systems }}
+						{{ range .Param "systems" }}
 							<option value="{{ . }}">{{ . }}</option>
 						{{ end }}
 						</select>
 					</div>
 				{{ end }}
-				{{ $provides := .Param "provides" }}
-				{{ if $provides }}
+				{{ if .Param "provides" }}
 					<div class="form-group col-lg-6">
 						What POWER resources do you require?
 						<select id="provides" name="provides">
-						{{ range $provides }}
+						{{ range .Param "provides" }}
 							<option value="{{ . }}">{{ . }}</option>
 						{{ end }}
 						</select>
 					</div>
 				{{ end }}
-				{{ $addons := .Param "addons" }}
-				{{ if $addons }}
+				{{ if .Param "addons" }}
 					<div class="form-group col-lg-6">
 						What POWER addons do you require?
 						<select id="addons" name="addons">
-						{{ range $addons }}
+						{{ range .Param "addons" }}
 							<option value="{{ . }}">{{ . }}</option>
 						{{ end }}
 						</select>
 					</div>
 				{{ end }}
-				{{ $operatingsystems := .Param "operatingsystems" }}
-				{{ if $operatingsystems }}
+				{{ if .Param "operatingsystems" }}
 					<div class="form-group col-lg-6">
 						What Operating System would you like on your POWER resource?
 						<select id="operatingsystem" name="operatingsystem">
-						{{ range $operatingsystems }}
+						{{ if .Param "operatingsystems.available.standard" }}
+						{{ range .Param "operatingsystems.available.standard" }}
 							<option value="{{ . }}">{{ . }}</option>
 						{{ end }}
+						{{ end }}
+						{{ if .Param "operatingsystems.available.gpuenabled" }}
+						{{ range .Param "operatingsystems.available.gpuenabled" }}
+							<option value="{{ . }}">{{ . }} (GPU-enabled)</option>
+						{{ end }}
+						{{ end }}
 						</select>
-						</div>
+					</div>
+				{{ end }}
+
+				{{ if .Param "opnstkflavors" }}
+					<div class="form-group col-lg-6">
+						What instance flavor  would you like?
+						<select id="opnstkflavor" name="opnstkflavor">
+						{{ if .Param "opnstkflavors.standard" }}
+                                                {{ range .Param "opnstkflavors.standard" }}
+                                                        <option value="{{ .name }}">{{ .cpus }} CPUs,  {{ .memory }}GB RAM, {{ .disk }}GB Disk</option>
+                                                {{ end }}
+                                                {{ end }}
+                                                {{ if .Param "opnstkflavors.gpuenabled" }}
+                                                {{ range .Param "opnstkflavors.gpuenabled" }}
+                                                        <option value="{{ .name }}">{{ .cpus }} CPUs,  {{ .memory }}GB RAM,  {{ .gpus }} GPUs,  {{ .disk }}GB Disk</option>
+                                                {{ end }}
+                                                {{ end }}
+						</select>
+					</div>
 				{{ end }}
 				<div class="form-group col-lg-6">
 					SSH Public Key File Upload : <input type="file" name="sshpubkeyupload" id="sshpubkeyupload" class="file" placeholder="Select your Public SSH Key File" onChange="getFileContents()" accept=".pub"><br>