diff --git a/coldfront/README.md b/coldfront/README.md index 1c0ff5c..5838686 100644 --- a/coldfront/README.md +++ b/coldfront/README.md @@ -468,7 +468,7 @@ Name: type `project storage` Description: enter anything you want Ensure that the following are checked: `Is available`, `Is public`, `Is allocatable` Under the resource attributes section, click `Add another Resource attribute` and select `quantity_label` from the drop down menu. In the `value` field, enter `Enter storage in 1TB increments` -Click `Add another Resource attribute` and select `quantity_default_value` from the drop down menu. In the `1` +Click `Add another Resource attribute` and select `quantity_default_value` from the drop down menu. In the `value` field, enter `1` Click `Add another Resource attribute` and select `OnDemand` from the drop down menu. In the `value` field, enter `Yes` - Then click `SAVE` @@ -514,7 +514,8 @@ NOTE: If there is a project you never want project reviews on, uncheck 'Requires ## Starting from Scratch (Half Day Tutorial)
-These steps were done in advance to allow for the presentation of a condensed half day version of the tutorial. If you would like to go through these steps yourself, destroy the containers, and delete the ColdFront database. Start the containers which will create a new, empty coldfront database. Then log in to ColdFront and follow the steps below: +These steps were done in advance to allow for the presentation of a condensed half day version of the tutorial. If you would like to go through these steps yourself, destroy the containers, and delete the ColdFront database. Start the containers which will create a new, empty coldfront database. Then log in to ColdFront and follow the steps below. +### Create a new, empty coldfront database ``` ./hpcts destroy @@ -537,7 +538,7 @@ You'll need to log in as some of the users for this tutorial to get things start - Log out - Log in locally as username `admin` password: `admin` - Go to Admin menu and click on `ColdFront Administration` Once there, scroll halfway down to the `Authentication and Authorization` section. Then click on the `Users` link -- Click on the `hpcadmin` user and scroll down to the `Permissions` section +- Click on the `hpcadmin` username (not the checkbox next to it) and scroll down to the `Permissions` section in the `Change User` window - Make this user a `superuser` by checking the boxes next to `Staff Status` and `Superuser Status` - scroll to the bottom and click `SAVE` - Click on the `sfoster` account. Under the `User Permissions` section add permissions to make this user the Center Director `allocation | allocation | Can manage invoice` @@ -593,7 +594,7 @@ Add an allocation attribute type: Make an allocation attribute changeable: - Under the `Allocation` section, click on `Allocation Attribute Types` -- Click on `Storage Quota` check the box next to `Is changeable` and then click the `SAVE` button +- Click on the number to the left of `Storage Quota`. In the `Change allocation attribute type` window, check the `Is changeable` box, then click the `SAVE` button - Log out ### Create a project & request an allocation diff --git a/docs/applications.md b/docs/applications.md index fa600e5..9bfb5b9 100644 --- a/docs/applications.md +++ b/docs/applications.md @@ -23,7 +23,7 @@ Login to frontend via SSH and user: `hpcadmin` password: `ilovelinux`: ``` ssh -p 6222 hpcadmin@localhost ``` -**NOTE: You must login to the front end before trying to login to any of the other containers!** +**NOTE: You must login to the front end as the `hpcadmin` user before trying to login to any of the other containers!** ### Single-sign on: Portal login/logout Because these applications are configured for single-sign on (SSO), if you login using Dex/OpenID Connect and want to switch between users you will either need to clear the browser cookies or restart the browser. You may wish to launch multiple 'incognito' windows for each user account used in the tutorial and switch between them as you go. diff --git a/ondemand/README.md b/ondemand/README.md index 70bc2de..017e1f0 100644 --- a/ondemand/README.md +++ b/ondemand/README.md @@ -153,10 +153,10 @@ column of the central table go from queued to running to completed. Let's go ahead and edit the script we submit by pressing the `Open Editor` button at the bottom of the script's panel (you likely have to scroll down). -Add this `sleep 1000` anywhere in the file (so long as it's not commented). +Add this `sleep 300` anywhere in the file (so long as it's not commented). ```bash -sleep 1000 +sleep 300 ``` Submit this job again and next we'll see another view where you can see @@ -254,9 +254,12 @@ Navigate back to Open OnDemand's `My interactive sessions` page and press the `Connect to Jupyter` button. This will open a new tab to the Jupyter application that's running on a compute node in your Slurm cluster! -Connect to the Jupyter session and navigate to the `jupyter_notebook_data` directory. -Open the `GUI-demo.ipynb` and this should open a new tab to this notebook. Run all -the cells in this notebook for a demonstration that this Jupyter does in fact work. +Connect to the Jupyter session and click on the `jupyter_notebook_data` directory in the leftmost panel. +Open the `GUI-demo.ipynb` and this should open a new tab to this notebook. The notebook has three cells, +each with a number on the left, and a block of code next to it. Run all +the cells in this notebook in order by clicking `Shift-enter` on each one for a demonstration that this +Jupyter demo does in fact work. + ![jupyter demo](imgs/jupyter_demo.gif) @@ -288,7 +291,7 @@ Lastly there's a new link entitled `Chemistry Notes`. Press this link and you'll be redirected to a custom page. This page is completely defined by administrators. Administrators supplied every single panel on this page. The idea here being that administrators can supply content to their own OnDemand -installation, thereby extending it's functionality by also supplying some +installation, thereby extending its functionality by also supplying some documentation. ![profile demo](imgs/profile_demo.gif) @@ -387,8 +390,7 @@ touch ~/ondemand/config/ondemand.d/ondemand.yml OOD_CONFIG_D_DIRECTORY="/home/hpcadmin/ondemand/config/ondemand.d" ``` - -Now let's [edit the ondemand.yml](https://localhost:3443/pun/sys/dashboard/files/edit/home/hpcadmin/ondemand/config/ondemand.d/ondemand.yml) +Now let's [edit the ondemand.yml](https://localhost:3443/pun/sys/dashboard/files/edit/fs/home/hpcadmin/ondemand/config/ondemand.d/ondemand.yml) file that we initialized above to add the configuration. ```yaml @@ -480,7 +482,7 @@ touch ~/ondemand/config/views/widgets/_hello_world.html Be sure to add the underscore prefix to this filename! This is a Rails convention for partials and not a mistype it is indeed `_hello_world.html`. -Now, we can use the [file editor to edit our new widget](https://localhost:3443/pun/sys/dashboard/files/edit/home/hpcadmin/ondemand/config/views/widgets/_hello_world.html). Let's add this very simple div to just thank you for being here. Of course, you can put +Now, we can use the [file editor to edit our new widget](https://localhost:3443/pun/sys/dashboard/files/edit/fs/home/hpcadmin/ondemand/config/views/widgets/_hello_world.html). Let's add this very simple div to just thank you for being here. Of course, you can put any text you like here. Feel free to have fun with it! ```html @@ -509,7 +511,7 @@ dashboard_layout: widgets: [ pinned_apps ] ``` -Now your dashboard should look something like this with a brand new widget we just creating showing up on the +Restart your webserver and your dashboard should look something like this with the brand new widget we just creating showing up on the dashboard. ![dashboard landing page with a new custom widget](imgs/dashboard_w_new_widget.png) @@ -555,9 +557,9 @@ or simply Press the "Files" button in Jupyter's row of the sandbox applications ![create sandbox app](imgs/create_sandbox_app.gif) -You'll also need to setup `git` for the hpcadmin user at this point, so let's go ahead and do that -and make first commit to the jupyter app as the starting point. - +You'll also need to setup `git` for the hpcadmin user at this point, so let's go ahead and +[open a shell window](https://localhost:3443/pun/sys/shell/ssh/ondemand). +We'll make the first commit to the jupyter app as the starting point. ```shell git config --global user.email hpcadmin@localhost git config --global user.name "HPC Admin" @@ -577,7 +579,7 @@ If you try to submit it as is, you'll get this error: ![error message that reads The cluster was never set. Either set it in form.yml.erb with `cluster` or `form.cluster` or set `cluster` in submit.yml.erb.](imgs/no_cluster.png) -We need to edit the `form.yml` in the appication's folder. We can navigate to the folder through the +We need to edit the `form.yml` in the application's folder. We can navigate to the folder through the files app. The URL is `https://localhost:3443/pun/sys/files/fs/home/hpcadmin/ondemand/dev/jupyter/`. Here you'll see the `form.yml` file. We can edit it by clicking on the file and pressing the "Edit"