Fixed bench roles for docker usage

ansible/playbooks/site.yml

@@ -30,5 +30,7 @@
   tags: import
 - import_playbook: netcapture.yml
   tags: netcapture
+- import_playbook: bench.yml
+  tags: bench
 
 ...

ansible/playbooks/site_docker.yml

@@ -25,6 +25,7 @@
         ansible_host: "{{ item }}"
         ansible_connection: docker
         ansible_python_interpreter: /usr/bin/python3
+        in_docker: true
       with_inventory_hostnames:
         - all:!localhost
 

ansible/roles/bench-server/defaults/main.yml

@@ -7,8 +7,8 @@ bench_server: "{{ hostvars[groups['bench_server'][0]]['ansible_default_ipv4']['a
 bench_time_stat: 15000
 
 bench_host: "{{ envsetup_ms_server_name | d() }}"
-bench_user: ubicast
-bench_password: "{{ envsetup_ms_superuser_pwd | d() }}"
+bench_user: admin
+bench_password: "{{ envsetup_ms_admin_pwd | d() }}"
 bench_oid:
 bench_dl_streams: false
 

ansible/roles/bench-server/tasks/main.yml

@@ -48,30 +48,34 @@
     update: yes
     force: yes
 
-- name: copy configuration for docker instance
+- name: copy configuration for testing tools
   copy:
     src: /etc/mediaserver/bench-streaming.conf
     dest: /usr/share/ms-testing-suite/config.json
     remote_src: yes
 
 - name: add docker key
+  when: not in_docker
   apt_key:
     url: https://download.docker.com/linux/debian/gpg
     state: present
 
 - name: add docker debian repository
+  when: not in_docker
   apt_repository:
     repo: "deb https://download.docker.com/linux/debian buster stable"
     state: present
     update_cache: yes
 
 - name: install docker
+  when: not in_docker
   apt:
     name: docker-ce
     state: latest
     update_cache: yes
 
 - name: generate docker image
+  when: not in_docker
   command:
     cmd: make build_docker_img
     chdir: /usr/share/ms-testing-suite

ansible/roles/bench-worker/defaults/main.yml

@@ -7,8 +7,8 @@ bench_server: "{{ hostvars[groups['bench_server'][0]]['ansible_default_ipv4']['a
 bench_time_stat: 15000
 
 bench_host: "{{ envsetup_ms_server_name | d() }}"
-bench_user: ubicast
-bench_password: "{{ envsetup_ms_superuser_pwd | d() }}"
+bench_user: admin
+bench_password: "{{ envsetup_ms_admin_pwd | d() }}"
 bench_oid:
 bench_dl_streams: false