[airavata] 01/03: AIRAVATA-3609 PGA Ansible updates for Rocky and Ansible 2.13

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git

commit 4847c7f0b4f6096bfab4bdd16dc3e4150c711854
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Aug 17 12:20:33 2022 -0400

    AIRAVATA-3609 PGA Ansible updates for Rocky and Ansible 2.13
---
 .../scigap/develop-js2/{pga_config => host_vars}/scigap/vars.yml      | 0
 .../scigap/develop-js2/{pga_config => host_vars}/scigap/vault.yml     | 0
 dev-tools/ansible/inventories/scigap/develop-js2/hosts                | 3 +++
 dev-tools/ansible/roles/pga/tasks/main.yml                            | 4 ++--
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/pga_config/scigap/vars.yml b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/scigap/vars.yml
similarity index 100%
rename from dev-tools/ansible/inventories/scigap/develop-js2/pga_config/scigap/vars.yml
rename to dev-tools/ansible/inventories/scigap/develop-js2/host_vars/scigap/vars.yml
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/pga_config/scigap/vault.yml b/dev-tools/ansible/inventories/scigap/develop-js2/host_vars/scigap/vault.yml
similarity index 100%
rename from dev-tools/ansible/inventories/scigap/develop-js2/pga_config/scigap/vault.yml
rename to dev-tools/ansible/inventories/scigap/develop-js2/host_vars/scigap/vault.yml
diff --git a/dev-tools/ansible/inventories/scigap/develop-js2/hosts b/dev-tools/ansible/inventories/scigap/develop-js2/hosts
index 9df05761c5..1c277b3aba 100644
--- a/dev-tools/ansible/inventories/scigap/develop-js2/hosts
+++ b/dev-tools/ansible/inventories/scigap/develop-js2/hosts
@@ -38,3 +38,6 @@ geo ansible_host=web.dev.scigap.org
 delta ansible_host=149.165.153.181
 ; custos-testdrive ansible_host=pgadev.scigap.org
 rnamake ansible_host=web.dev.scigap.org
+
+[pga]
+scigap ansible_host=149.165.155.229
diff --git a/dev-tools/ansible/roles/pga/tasks/main.yml b/dev-tools/ansible/roles/pga/tasks/main.yml
index 25c3dfa41f..2da245c206 100644
--- a/dev-tools/ansible/roles/pga/tasks/main.yml
+++ b/dev-tools/ansible/roles/pga/tasks/main.yml
@@ -23,7 +23,7 @@
   file: path="{{ doc_root_dir }}" state=directory owner="{{user}}" group="{{group}}"
   become: yes
 
-- include: install_deps_{{ ansible_distribution }}_{{ ansible_distribution_major_version }}.yml
+- include_tasks: install_deps_{{ ansible_distribution }}_{{ ansible_distribution_major_version }}.yml
 
 - name: Git clone php gateway
   git:
@@ -119,7 +119,7 @@
   become: yes
 
 - name: Run composer install
-  composer: command=install working_dir="{{ doc_root_dir }}"
+  composer: command=install working_dir="{{ doc_root_dir }}" no_plugins=yes
   become: yes
   become_user: "{{user}}"