Merge pull request 'Updates to OSU HUB Form, Update OSU logo, and other small changes' (#46) from maxschmidt/openpower.foundation:master into master

Reviewed-on: website/openpower.foundation#46
Reviewed-by: Toshaan Bharvani <toshaan@vantosh.com>

content/hub/_index.md

@@ -4,13 +4,8 @@ date: 2020-03-10
 draft: false
 ---
 
-The OpenPOWER HUB Resources is part of the [HUB SIG](/groups/hub/) and provides POWER based resources for usage.  
+The OpenPOWER HUB Resources is part of the [HUB SIG](/groups/hub/) and provides POWER based resources for usage. The [HUB SIG](/groups/hub/) is a public Special Integration Group that provides information and resources on how to port to POWER.
 
-The [HUB SIG](/groups/hub/) is a public Special Integration Group that provides information and resources on how to port to POWER.  
+OpenPOWER Foundation HUB providers are OpenPOWER Foundation members that are part of the [HUB SIG](/groups/hub/), that give you access to POWER hardware to enable you to get acquainted with the POWER platform. Each provider has their own specific setup and you can request access through our OPF HUB Request Form.
 
-
-OpenPOWER Foundation HUB providers are OpenPOWER Foundation members that are part of the [HUB SIG](/groups/hub/),
-that give you access to POWER hardware to enable you to get acquinted with the POWER platform.  
-Each provider has it's specific setup and you can request access through our OPF HUB Request Form.  
-
-Here is a list of OpenPOWER Hub providers.  
+Here are our current OpenPOWER Hub providers:

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

themes/openpowerfoundation/assets/css/pages.scss

@@ -223,7 +223,7 @@ section#steeringcomittee {
 			font-size: 14px;
 		}
 	}
-	.operatingsystsms ul {
+	.operatingsystems ul {
 		list-style-type: disc;
 	}
 	.operatingsystems ul li {

themes/openpowerfoundation/layouts/hub/single.html

@@ -11,7 +11,7 @@
 		<div class="row">
 			<div class="col-lg-4">
 				{{ if .Param "member" }}
-					Provider :&nbsp;
+					<h3>Provider :&nbsp;
 					{{ $member := .Param "member" }}
 					{{ range where .Site.RegularPages "Section" "members" }}
 						{{ $membercompany := .File.BaseFileName }}
@@ -33,63 +33,51 @@
 							{{ end }}
 							</a>
 						{{ end }}
-					{{ end }}
+					{{ end }}</h3>
 				{{ end }}
 			</div>
-			{{ if .Param "systems" }}
 			<div class="col-lg-4">
-					POWER Based systems :
+				{{ if .Param "systems" }}
+				<h3>POWER Based systems :</h3>
 				<ul>
 				{{ range $s := .Param "systems" }}
 					<li>{{ $s }}</li>
 				{{ end }}
 				</ul>					
-				</div>
 				{{ end }}
 				{{ if .Param "provides" }}
-				<div class="col-lg-4">
-					Provides following OPF HUB resources :
+				<h3>Provides these OPF HUB resources :</h3>
 				<ul>
 				{{ range $p := .Param "provides" }}
 					<li>{{ $p }}</li>
 				{{ end }}
 				</ul>
-				</div>
 				{{ end }}
-			<div class="col-lg-4">&nbsp;</div>
-			{{ if .Param "addons" }}
-				<div class="col-lg-4">
-					Resource Addons :
-					<ul>
-					{{ range $a := .Param "addons" }}
-						<li>{{ $a }}</li>
-					{{ end }}
-					</ul>
 			</div>
-			{{ end }}
-			{{ if .Param "projects" }}
 			<div class="col-lg-4">
-					Project Types :
+			{{ if .Param "projects" }}
+				<h3>Project Types :</h3>
 				<ul>
 				{{ range $o := .Param "projects" }}
 					<li>{{ $o }}</li>
 				{{ end }}
 				</ul>
-				</div>
+			{{ else }}
+				&nbsp;
+			{{ end }}
+			{{ if .Param "addons" }}
+				<h3>Resource Addons :</h3>
+				<ul>
+				{{ range $a := .Param "addons" }}
+				{{ if ne $a "none" }}
+					<li>{{ $a }}</li>
 				{{ end }}
-			<div class="col-lg-4">&nbsp;</div>
-			{{ if .Param "operatingsystems" }}
-				<div class="col-lg-8 operatingsystems">
-					Operating Systems :
-					<ul class="operatingsystems">
-					{{ range $s := .Param "operatingsystems" }}
-						<li class="operatingsystems">{{ $s }}</li>
 				{{ end }}
 				</ul>
-				</div>
 			{{ end }}
 			</div>
 		</div>
+	</div>
 	{{ if .Content }}
 	<div class="row">
 		{{ .Content }}

themes/openpowerfoundation/layouts/partials/hubform.html

@@ -46,58 +46,78 @@ 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>
+				{{ 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 }}