diff --git a/.org/openstack/readme.org b/.org/openstack/readme.org index 2d55c757..3401cc49 100644 --- a/.org/openstack/readme.org +++ b/.org/openstack/readme.org @@ -950,21 +950,9 @@ You'll want to keep the master node security patched as it will have a publicly :CUSTOM_ID: h-7062BF9B :END: -In order to build a GPU enabled cluster, [[https://www.zonca.dev/posts/2023-01-23-kubernetes-gpu-jetstream2][refer to Andrea's documentation]]. ~jupyterhub.sh~ takes ~-g~ flag to help facilate this option. +In order to build a GPU enabled cluster, [[https://www.zonca.dev/posts/2024-02-09-kubernetes-gpu-jetstream2][refer to Andrea's documentation]]. -There is an image you will need to pull: - -#+begin_src sh :eval no - docker pull unidata/science-gateway-gpu -#+end_src - -or build with: - -#+begin_src sh :eval no - docker build -t unidata/science-gateway-gpu -f Dockerfile.gpu . -#+end_src - -Pay special attention to the ~cluster.tfvars~ to select VMs that have GPU hardware. +Also, pay special attention to the ~cluster.tfvars~ to select VMs that have GPU hardware. * Appendix :PROPERTIES: diff --git a/openstack/jupyterhub.sh b/openstack/jupyterhub.sh index 73b39972..6abfcb0c 100755 --- a/openstack/jupyterhub.sh +++ b/openstack/jupyterhub.sh @@ -14,7 +14,6 @@ function usage() echo -e "\t-n, --name JupyterHub name" echo -e "\t-p, --ip JupyterHub IP" echo -e "\t-o, --openrc openrc.sh path" - echo -e "\t-g, --gpu" exit 1 } @@ -34,10 +33,6 @@ do OPENRC="$2" shift # past argument ;; - -g|--gpu) - GPU="$1" - shift # past argument - ;; -h|--help) usage exit @@ -80,5 +75,4 @@ fi -i ${dir}/jhubs/${JUPYTERHUB}/${JUPYTERHUB} \ -p ${IP} \ -m ${dir}/jhubs/${JUPYTERHUB}/helm \ - -c ${dir}/jhubs/${JUPYTERHUB}/secrets.yaml \ - $GPU + -c ${dir}/jhubs/${JUPYTERHUB}/secrets.yaml diff --git a/openstack/readme.md b/openstack/readme.md index bbc6e989..8569286d 100644 --- a/openstack/readme.md +++ b/openstack/readme.md @@ -929,21 +929,9 @@ reboot -h now ### GPU Enabled Clusters -In order to build a GPU enabled cluster, [refer to Andrea's documentation](https://www.zonca.dev/posts/2023-01-23-kubernetes-gpu-jetstream2). `jupyterhub.sh` takes `-g` flag to help facilate this option. +In order to build a GPU enabled cluster, [refer to Andrea's documentation](https://www.zonca.dev/posts/2024-02-09-kubernetes-gpu-jetstream2). -There is an image you will need to pull: - -```sh -docker pull unidata/science-gateway-gpu -``` - -or build with: - -```sh -docker build -t unidata/science-gateway-gpu -f Dockerfile.gpu . -``` - -Pay special attention to the `cluster.tfvars` to select VMs that have GPU hardware. +Also, pay special attention to the `cluster.tfvars` to select VMs that have GPU hardware. diff --git a/openstack/z2j.sh b/openstack/z2j.sh index 057167d7..d6ad24ec 100755 --- a/openstack/z2j.sh +++ b/openstack/z2j.sh @@ -15,7 +15,6 @@ function usage() echo -e "\t-p, --ip cluster ip" echo -e "\t-m, --helm full path to helm directory" echo -e "\t-c, --secrets.yaml full path" - echo -e "\t-g, --gpu" exit 1 } @@ -59,10 +58,6 @@ do SECRETS="$2" shift # past argument ;; - -g|--gpu) - GPU="$1" - shift # past argument - ;; -h|--help) usage exit @@ -135,13 +130,6 @@ if [ -z "$SECRETS" ]; exit 1 fi -if [ -z "$GPU" ]; - then - IMAGE="unidata/science-gateway" - else - IMAGE="unidata/science-gateway-gpu" -fi - mkdir -p $KUBE mkdir -p $NOVACLIENT mkdir -p $TERRAFORM @@ -161,4 +149,4 @@ docker run -it --name ${INVENTORY} \ -v ${SECRETS}:/home/openstack/jupyterhub-deploy-kubernetes-jetstream/secrets.yaml \ -e CLUSTER=${INVENTORY} \ -e IP=${IP} \ - ${IMAGE} /bin/bash + unidata/science-gateway /bin/bash