From f87e52cf631f3fad9424f569bb857001154cdae9 Mon Sep 17 00:00:00 2001 From: ionutboangiu Date: Wed, 15 May 2024 20:19:23 +0300 Subject: [PATCH] Update ansible calls playbooks Fixes issue where cgrates role would attempt to run setup scripts for postgres, when postgres is not installed. --- data/ansible/calls/asterisk/main.yaml | 11 +++++++++-- data/ansible/calls/freeswitch/main.yaml | 11 +++++++++-- data/ansible/calls/kamailio/main.yaml | 12 ++++++++---- 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/data/ansible/calls/asterisk/main.yaml b/data/ansible/calls/asterisk/main.yaml index 90367ea94..21c9a0581 100644 --- a/data/ansible/calls/asterisk/main.yaml +++ b/data/ansible/calls/asterisk/main.yaml @@ -2,9 +2,16 @@ - name: Set up environment in order to run call tests for Asterisk hosts: all roles: - - ../../roles/go - - ../../roles/cgrates - ../../roles/asterisk + - ../../roles/go + - role: ../../roles/cgrates + vars: + cgrates_dbs: + - mysql + cgrates_dependencies: + - git + - redis-server + - mariadb-server - role: ../../roles/pjsua vars: pjsua_version: '2.9' diff --git a/data/ansible/calls/freeswitch/main.yaml b/data/ansible/calls/freeswitch/main.yaml index 67334df84..ede0dd7d3 100644 --- a/data/ansible/calls/freeswitch/main.yaml +++ b/data/ansible/calls/freeswitch/main.yaml @@ -12,6 +12,13 @@ - name: Install and config CGRateS ansible.builtin.import_role: name: ../../roles/cgrates + vars: + cgrates_dbs: + - mysql + cgrates_dependencies: + - git + - redis-server + - mariadb-server - name: Unzip FreeSWITCH config become: yes @@ -35,13 +42,13 @@ become: yes shell: 'sudo rm -rf *' args: - chdir: '/etc/freeswitch' + chdir: /etc/freeswitch - name: Copy our custom config for FreeSWITCH in /etc/freeswitch become: yes shell: 'sudo cp -r {{ cgrates_dir }}/data/tutorial_tests/fs_evsock/freeswitch/etc/freeswitch/* /etc/freeswitch' args: - chdir: '/etc/freeswitch' + chdir: /etc/freeswitch - name: Configure PJSUA ansible.builtin.import_role: diff --git a/data/ansible/calls/kamailio/main.yaml b/data/ansible/calls/kamailio/main.yaml index cb3aac0c8..745a8ee44 100644 --- a/data/ansible/calls/kamailio/main.yaml +++ b/data/ansible/calls/kamailio/main.yaml @@ -2,11 +2,15 @@ - hosts: all roles: - ../../roles/kamailio - - ../../roles/go - - - ../../roles/cgrates - + - role: ../../roles/cgrates + vars: + cgrates_dbs: + - mysql + cgrates_dependencies: + - git + - redis-server + - mariadb-server - role: ../../roles/pjsua vars: pjsua_version: '2.9'