From 03f088cb9613813631a7c99ef38a0236fd657bf6 Mon Sep 17 00:00:00 2001
From: XaverStiensmeier <xaverstiensmeier@gmx.de>
Date: Wed, 14 Feb 2024 11:55:12 +0100
Subject: [PATCH] fixed a few vpnwkr -> vpngtw remnants. Excluded vpngtw from
 slurm setup

---
 .../markdown/features/cluster_commands.md     | 29 +++++++++++++++++--
 resources/bin/{binfo => bibiinfo}             |  0
 .../roles/bibigrid/files/slurm/create.sh      |  2 +-
 .../roles/bibigrid/files/slurm/fail.sh        |  2 +-
 .../playbook/roles/bibigrid/handlers/main.yml |  3 --
 .../playbook/roles/bibigrid/tasks/main.yml    |  2 +-
 6 files changed, 29 insertions(+), 9 deletions(-)
 rename resources/bin/{binfo => bibiinfo} (100%)

diff --git a/documentation/markdown/features/cluster_commands.md b/documentation/markdown/features/cluster_commands.md
index 8d67426e..f5f9b02e 100644
--- a/documentation/markdown/features/cluster_commands.md
+++ b/documentation/markdown/features/cluster_commands.md
@@ -1,10 +1,33 @@
 # BiBiGrid Cluster Commands
 
+## [bibiinfo](../../../resources/bin/bibiinfo)
+Similar to `sinfo` but shows detailed information regarding node features.
+
+## [bibilog](../../../resources/bin/bibilog)
+`bibilog` executes `tail -f` on the most recent worker creation out log.
+Thereby, it helps you with understanding any startup issues.
+
+## [bibiplay](../../../resources/bin/bibiplay)
+`bibiplay` is mainly a shortcut for `ansible-playbook /opt/playbook/site.yml -i /opt/playbook/ansible_hosts`
+which allows you to execute the ansible playbook more easily.
+
+### Examples
+You have changed something in the common configuration and want to propagate this change to the master.
+```sh
+bibiplay -l master
+# executes the playbook only for the master
+```
+
+You have changed something in the slurm configuration and want to propagate this change to the master.
+```sh
+bibiplay -l master -t slurm
+```
+
 ## [bibiname](../../../resources/playbook/roles/bibigrid/templates/bin/bibiname.j2)[m|v|default: w] [number]
 
 This command creates node names for the user without them needing to copy the cluster-id.
-Takes two arguments. The first defines whether a master, vpnwkr or worker is meant. Worker is the default.
-The second parameter - if vpnwkr or worker is selected - defines which vpnwkr or worker is meant.
+Takes two arguments. The first defines whether a master, vpngtw or worker is meant. Worker is the default.
+The second parameter - if vpngtw or worker is selected - defines which vpngtw or worker is meant.
 
 ### Examples
 Assume the cluster-id `20ozebsutekrjj4`.
@@ -16,7 +39,7 @@ bibiname m
 
 ```sh
 bibiname v 0
-# bibigrid-vpnwkr-20ozebsutekrjj4-0
+# bibigrid-vpngtw-20ozebsutekrjj4-0
 ```
 
 ```sh
diff --git a/resources/bin/binfo b/resources/bin/bibiinfo
similarity index 100%
rename from resources/bin/binfo
rename to resources/bin/bibiinfo
diff --git a/resources/playbook/roles/bibigrid/files/slurm/create.sh b/resources/playbook/roles/bibigrid/files/slurm/create.sh
index e48d9954..d5bbc4c0 100644
--- a/resources/playbook/roles/bibigrid/files/slurm/create.sh
+++ b/resources/playbook/roles/bibigrid/files/slurm/create.sh
@@ -10,7 +10,7 @@ process_string() {
     fifth=${elements[4]}
 
     # Replace undesired characters in the second element
-    second=$(echo "$second" | sed -E 's/worker-/worker_/; s/vpnwkr-/vpnwkr_/')
+    second=$(echo "$second" | sed -E 's/worker-/worker_/; s/vpngtw-/vpngtw_/')
 
     # Check if the fifth element is not empty
     if [[ ! -z $fifth ]]; then
diff --git a/resources/playbook/roles/bibigrid/files/slurm/fail.sh b/resources/playbook/roles/bibigrid/files/slurm/fail.sh
index 436f8b59..38d723b4 100644
--- a/resources/playbook/roles/bibigrid/files/slurm/fail.sh
+++ b/resources/playbook/roles/bibigrid/files/slurm/fail.sh
@@ -10,7 +10,7 @@ process_string() {
     fifth=${elements[4]}
 
     # Replace undesired characters in the second element
-    second=$(echo "$second" | sed -E 's/worker-/worker_/; s/vpnwkr-/vpnwkr_/')
+    second=$(echo "$second" | sed -E 's/worker-/worker_/; s/vpngtw-/vpngtw_/')
 
     # Check if the fifth element is not empty
     if [[ ! -z $fifth ]]; then
diff --git a/resources/playbook/roles/bibigrid/handlers/main.yml b/resources/playbook/roles/bibigrid/handlers/main.yml
index 6166ce19..d4888f5a 100644
--- a/resources/playbook/roles/bibigrid/handlers/main.yml
+++ b/resources/playbook/roles/bibigrid/handlers/main.yml
@@ -17,14 +17,12 @@
   systemd:
     name: slurmdbd
     state: restarted
-  when: "'vpnwkr' not in group_names"
 
 - name: slurmrestd
   systemd:
     name: slurmrestd
     state: restarted
     daemon_reload: true
-  when: "'vpnwkr' not in group_names"
 
 - name: slurmctld
   systemd:
@@ -36,7 +34,6 @@
   systemd:
     name: slurmd
     state: restarted
-  when: "'vpnwkr' not in group_names"
 
 - name: zabbix-agent
   systemd:
diff --git a/resources/playbook/roles/bibigrid/tasks/main.yml b/resources/playbook/roles/bibigrid/tasks/main.yml
index b15593b1..1a6713f7 100644
--- a/resources/playbook/roles/bibigrid/tasks/main.yml
+++ b/resources/playbook/roles/bibigrid/tasks/main.yml
@@ -136,7 +136,7 @@
     - debug:
         msg: "[BIBIGRID] Setup Slurm"
     - import_tasks: 042-slurm.yml
-      when: "'vpnwkr' not in group_names"
+      when: "'vpngtw' not in group_names"
     - import_tasks: 042-slurm-server.yml
       when: "'master' in group_names"