From 69821adc20ee4e04dfa28be5243b1d98de9a7b50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix-Antoine=20Fortin?=
 <felix-antoine.fortin@calculquebec.ca>
Date: Mon, 19 Oct 2020 11:57:52 -0400
Subject: [PATCH] Fix notebook version to 6.0.3

A regression was introduced in notebook 6.1.0 where it is no
longer possible to start a terminal by simply going to the url
"/terminals/1". A fix is currently underway, but until a new
version of notebook is released, we will settle for 6.0.3.

Related issue:
https://github.com/jupyter/notebook/issues/5790

PR fixing this issue:
https://github.com/jupyter/notebook/pull/5813
---
 data/common.yaml  | 1 +
 manifests/node.pp | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/data/common.yaml b/data/common.yaml
index 81621e1..0ec6d4f 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -1,5 +1,6 @@
 # jupyterhub/data/common.yaml
 ---
+jupyterhub::notebook::version: 6.0.3
 jupyterhub::jupyterhub::version: 1.1.0
 jupyterhub::batchspawner::url: https://github.com/jupyterhub/batchspawner/archive/v1.0.0.zip
 jupyterhub::slurmformspawner::version: 2.2.0
diff --git a/manifests/node.pp b/manifests/node.pp
index a2bbecf..49935c6 100644
--- a/manifests/node.pp
+++ b/manifests/node.pp
@@ -23,8 +23,11 @@
 }
 
 class jupyterhub::node::install (Stdlib::Absolutepath $prefix) {
+
+  $notebook_version = lookup('jupyterhub::notebook::version')
+
   exec { 'pip_notebook':
-    command => "${prefix}/bin/pip install --no-cache-dir notebook",
+    command => "${prefix}/bin/pip install --no-cache-dir notebook==${notebook_version}",
     creates => "${prefix}/lib/python3.6/site-packages/notebook/",
     require => Exec['jupyterhub_venv']
   }