diff --git a/awx/playbooks/project_update.yml b/awx/playbooks/project_update.yml index 092cfd0467..bf3ee934a8 100644 --- a/awx/playbooks/project_update.yml +++ b/awx/playbooks/project_update.yml @@ -154,29 +154,20 @@ gather_facts: false connection: local name: Install content with ansible-galaxy command if necessary - vars: - yaml_exts: - - {ext: .yml} - - {ext: .yaml} tasks: - block: - - name: detect roles/requirements.(yml/yaml) - stat: - path: "{{project_path|quote}}/roles/requirements{{ item.ext }}" - with_items: "{{ yaml_exts }}" - register: doesRequirementsExist - - name: fetch galaxy roles from requirements.(yml/yaml) command: > - ansible-galaxy role install -r {{ item.stat.path }} + ansible-galaxy role install -r {{ item }} --roles-path {{projects_root}}/.__awx_cache/{{local_path}}/stage/requirements_roles {{ ' -' + 'v' * ansible_verbosity if ansible_verbosity else '' }} args: chdir: "{{project_path|quote}}" register: galaxy_result - with_items: "{{ doesRequirementsExist.results }}" - when: item.stat.exists + with_fileglob: + - "{{project_path|quote}}/roles/requirements.yaml" + - "{{project_path|quote}}/roles/requirements.yml" changed_when: "'was installed successfully' in galaxy_result.stdout" environment: ANSIBLE_FORCE_COLOR: false @@ -187,22 +178,19 @@ - install_roles - block: - - name: detect collections/requirements.(yml/yaml) - stat: - path: "{{project_path|quote}}/collections/requirements{{ item.ext }}" - with_items: "{{ yaml_exts }}" - register: doesCollectionRequirementsExist - - name: fetch galaxy collections from collections/requirements.(yml/yaml) command: > - ansible-galaxy collection install -r {{ item.stat.path }} + ansible-galaxy collection install -r {{ item }} --collections-path {{projects_root}}/.__awx_cache/{{local_path}}/stage/requirements_collections {{ ' -' + 'v' * ansible_verbosity if ansible_verbosity else '' }} args: chdir: "{{project_path|quote}}" register: galaxy_collection_result - with_items: "{{ doesCollectionRequirementsExist.results }}" - when: item.stat.exists + with_fileglob: + - "{{project_path|quote}}/collections/requirements.yaml" + - "{{project_path|quote}}/collections/requirements.yml" + - "{{project_path|quote}}/requirements.yaml" + - "{{project_path|quote}}/requirements.yml" changed_when: "'Installing ' in galaxy_collection_result.stdout" environment: ANSIBLE_FORCE_COLOR: false