From 034f995a0464b46152ae6de66baca1daee06b8c8 Mon Sep 17 00:00:00 2001 From: caubet_m Date: Mon, 2 Sep 2019 17:44:28 +0200 Subject: [PATCH] SD 02.09.2019: merlin-l-002 has now NoMachine --- .../merlin6/02 accessing-merlin6/accessing-interactive-nodes.md | 2 +- pages/merlin6/02 accessing-merlin6/nomachine.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/merlin6/02 accessing-merlin6/accessing-interactive-nodes.md b/pages/merlin6/02 accessing-merlin6/accessing-interactive-nodes.md index 46d568a..014c671 100644 --- a/pages/merlin6/02 accessing-merlin6/accessing-interactive-nodes.md +++ b/pages/merlin6/02 accessing-merlin6/accessing-interactive-nodes.md @@ -19,7 +19,7 @@ The Merlin6 login nodes are the following: | Hostname | SSH | NoMachine | #cores | #Threads | CPU | Memory | Scratch | Scratch Mountpoint | | ------------------- | --- | --------- | ------ |:--------:| :-------------------- | ------ | ---------- | :------------------ | | merlin-l-001.psi.ch | yes | yes | 2 x 22 | 2 | Intel Xeon Gold 6152 | 384GB | 1.8TB NVMe | ``/scratch`` | -| merlin-l-002.psi.ch | yes | - | 2 x 22 | 2 | Intel Xeon Gold 6142 | 384GB | 1.8TB NVMe | ``/scratch`` | +| merlin-l-002.psi.ch | yes | yes | 2 x 22 | 2 | Intel Xeon Gold 6142 | 384GB | 1.8TB NVMe | ``/scratch`` | | merlin-l-01.psi.ch | yes | - | 2 x 16 | 2 | Intel Xeon E5-2697Av4 | 512GB | 100GB SAS | ``/scratch`` | | ~~merlin-l-02.psi.ch~~ | - | - | 2 x 16 | 2 | Intel Xeon E5-2697Av4 | 512GB | 100GB SAS | ``/scratch`` | diff --git a/pages/merlin6/02 accessing-merlin6/nomachine.md b/pages/merlin6/02 accessing-merlin6/nomachine.md index b2a8059..21f0207 100644 --- a/pages/merlin6/02 accessing-merlin6/nomachine.md +++ b/pages/merlin6/02 accessing-merlin6/nomachine.md @@ -31,7 +31,7 @@ to the IT Department by opening a PSI Service Now ticket: The Merlin6 NoMachine service is located **only** in the following login nodes: * `merlin-l-001.psi.ch` -* ~~`merlin-l-002.psi.ch`~~ (not available yet) +* `merlin-l-002.psi.ch` Below are explained all the steps necessary for configuring the access to the NoMachine service running on a login node.