Fix benchmark configuration paths | refs #38603

doc/bench.md

@@ -109,7 +109,7 @@ If you want to test with a video stream, you can start it with using the docker
 `cd /usr/share/ms-testing-suite && make run_live`
 
 Or directly by hand:
-`/usr/share/ms-testing-suite/ms_live_streamer.py /etc/mediaserver/bench-streaming.conf`
+`/usr/share/ms-testing-suite/ms_live_streamer.py /etc/benchmark/streaming.conf`
 
 Go with your browser on `http://<bench_server>:8089`. You might have to use an SSH tunnel to access this port.
 

doc/config.md

@@ -79,4 +79,3 @@ mymediaserver | SUCCESS => {
 }
 [...]
 ```
-

doc/deploy.md

@@ -35,4 +35,3 @@ To view all tags avalaible, run:
 ```
 grep 'tags:' ./playbooks/site.yml | grep -v always | sed 's,.*tags: ,,'
 ```
-

roles/bench-server/tasks/main.yml

@@ -13,13 +13,14 @@
 
 - name: ensure configuration directory exists
   ansible.builtin.file:
-    path: /etc/mediaserver
+    path: /etc/benchmark
     state: directory
     mode: "755"
 
 - name: benchmark configuration settings
   ansible.builtin.copy:
-    dest: /etc/mediaserver/bench-conf.json
+    backup: true
+    dest: /etc/benchmark/benchmark.json
     content: |
       {
       "LOCUST_HOST":"{{ bench_server }}",
@@ -44,7 +45,7 @@
 - name: streaming configuration settings
   ansible.builtin.template:
     src: bench-streaming.conf.j2
-    dest: /etc/mediaserver/bench-streaming.conf
+    dest: /etc/benchmark/streaming.conf
     mode: "644"
 
 - name: clone ms-testing-suite repository
@@ -57,7 +58,7 @@
 
 - name: copy configuration for testing tools
   ansible.builtin.copy:
-    src: /etc/mediaserver/bench-streaming.conf
+    src: /etc/benchmark/streaming.conf
     dest: /usr/share/ms-testing-suite/config.json
     remote_src: true
     mode: "644"

roles/bench-worker/tasks/main.yml

@@ -13,13 +13,14 @@
 
 - name: ensure configuration directory exists
   ansible.builtin.file:
-    path: /etc/mediaserver
+    path: /etc/benchmark
     state: directory
     mode: "755"
 
 - name: benchmark configuration settings
   ansible.builtin.copy:
-    dest: /etc/mediaserver/bench-conf.json
+    backup: true
+    dest: /etc/benchmark/benchmark.json
     content: |
       {
       "LOCUST_HOST":"{{ bench_server }}",