Username for ssh computer configure

aiidateam · Oct 4, 2023 · 0cc8749 · 0cc8749
1 parent edf3012
commit 0cc8749
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 6 deletions.
diff --git a/daint.cscs.ch/gpu/computer-configure.yml b/daint.cscs.ch/gpu/computer-configure.yml
@@ -1,3 +1,14 @@
 ---
+username: '{{ username }}'
 safe_interval: 60
 proxy_command: ssh -q -Y {username}@ela.cscs.ch netcat daint.cscs.ch 22
+metadata:
+    tooltip: |
+        <p>
+            Setup up the SSH connection.
+        </p>
+    ssh_auth: 2FA
+    username:
+        description: The username to use for the SSH connection
+        type: text
+        key_display: SSH username
diff --git a/daint.cscs.ch/gpu/computer-setup.yml b/daint.cscs.ch/gpu/computer-setup.yml
@@ -28,7 +28,6 @@ metadata:
             The CSCS now require MFA to login, please check the <a href="https://user.cscs.ch/access/auth/mfa/" target="_blank">MFA CSCS documentation</a> for details on how to set up SSH connection. <br>
             If you are using the AiiDAlab, please use the <a href="https://github.com/aiidalab/aiidalab-mfa-cscs" target="_blank">MFA CSCS plugin</a> to set SSH connection.
         </p>
-    ssh_auth: 2FA
     label:
         default: daint-gpu
         description: A short name to identify the computer

diff --git a/daint.cscs.ch/mc/computer-configure.yml b/daint.cscs.ch/mc/computer-configure.yml
@@ -7,6 +7,7 @@ metadata:
         <p>
             Setup up the SSH connection.
         </p>
+    ssh_auth: 2FA
     username:
         description: The username to use for the SSH connection
         type: text

diff --git a/daint.cscs.ch/mc/computer-setup.yml b/daint.cscs.ch/mc/computer-setup.yml
@@ -25,7 +25,6 @@ metadata:
             The CSCS now require MFA to login, please check the <a href="https://user.cscs.ch/access/auth/mfa/" target="_blank">MFA CSCS documentation</a> for details on how to set up SSH connection. <br>
             If you are using the AiiDAlab, please use the <a href="https://github.com/aiidalab/aiidalab-mfa-cscs" target="_blank">MFA CSCS plugin</a> to set SSH connection.
         </p>
-    ssh_auth: 2FA
     label:
         default: daint-mc
         description: A short name to identify the computer

diff --git a/gh_page/resource.schema.json b/gh_page/resource.schema.json
@@ -21,7 +21,8 @@
                 "type": "string"
             },
             "ssh_auth": {
-                "type": "string"
+                "type": "string",
+                "enum": ["password", "2FA"]
             }
         },
         "additionalProperties": {
@@ -129,6 +130,9 @@
     "computer-configure.yml": {
         "type": "object",
         "properties": {
+            "username": {
+                "type": "string"
+            },
             "safe_interval": {
                 "type": "integer"
             },
@@ -139,8 +143,8 @@
                 "$ref": "#/definitions/metadata"
             }
         },
-        "required": ["safe_interval"],
-        "additionalProperties": false,
+        "required": ["safe_interval", "username"],
+        "additionalProperties": true,
         "title": "Computer Configure"
     },
     "code.yml": {

diff --git a/merlin.psi.ch/cpu/computer-configure.yml b/merlin.psi.ch/cpu/computer-configure.yml
@@ -6,6 +6,7 @@ metadata:
         <p>
             Setup up the SSH connection.
         </p>
+    ssh_auth: password
     username:
         description: The username to use for the SSH connection
         type: text

diff --git a/merlin.psi.ch/gpu/computer-configure.yml b/merlin.psi.ch/gpu/computer-configure.yml
@@ -1,3 +1,13 @@
 ---
 safe_interval: 60
-proxy_command: ssh -q -Y {username}@ela.cscs.ch netcat daint.cscs.ch 22
+username: '{{ username }}'
+metadata:
+    tooltip: |
+        <p>
+            Setup up the SSH connection.
+        </p>
+    ssh_auth: password
+    username:
+        description: The username to use for the SSH connection
+        type: text
+        key_display: SSH username