External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-17 06:17:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary blocks from project update playbook

Browse Source
This commit is contained in:
Alan Rominger
2022-04-01 15:32:01 -04:00
parent c7049e1a0e
commit c84e603ac5
1 changed files with 28 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
awx/playbooks/project_update.yml
View File

@@ -180,42 +180,38 @@
- install_roles - install_roles
- install_collections - install_collections
- block: - name: fetch galaxy roles from requirements.(yml/yaml)
- name: fetch galaxy roles from requirements.(yml/yaml) command: >
command: > ansible-galaxy role install -r {{ item }}
ansible-galaxy role install -r {{ item }} --roles-path {{projects_root}}/.__awx_cache/{{local_path}}/stage/requirements_roles
--roles-path {{projects_root}}/.__awx_cache/{{local_path}}/stage/requirements_roles {{ ' -' + 'v' * ansible_verbosity if ansible_verbosity else '' }}
{{ ' -' + 'v' * ansible_verbosity if ansible_verbosity else '' }} args:
args: chdir: "{{project_path|quote}}"
chdir: "{{project_path|quote}}" register: galaxy_result
register: galaxy_result with_fileglob:
with_fileglob: - "{{project_path|quote}}/roles/requirements.yaml"
- "{{project_path|quote}}/roles/requirements.yaml" - "{{project_path|quote}}/roles/requirements.yml"
- "{{project_path|quote}}/roles/requirements.yml" changed_when: "'was installed successfully' in galaxy_result.stdout"
changed_when: "'was installed successfully' in galaxy_result.stdout" environment: "{{ galaxy_task_env }}"
environment: "{{ galaxy_task_env }}"
when: roles_enabled|bool when: roles_enabled|bool
tags: tags:
- install_roles - install_roles
- block: - name: fetch galaxy collections from collections/requirements.(yml/yaml)
- name: fetch galaxy collections from collections/requirements.(yml/yaml) command: >
command: > ansible-galaxy collection install -r {{ item }}
ansible-galaxy collection install -r {{ item }} --collections-path {{projects_root}}/.__awx_cache/{{local_path}}/stage/requirements_collections
--collections-path {{projects_root}}/.__awx_cache/{{local_path}}/stage/requirements_collections {{ ' -' + 'v' * ansible_verbosity if ansible_verbosity else '' }}
{{ ' -' + 'v' * ansible_verbosity if ansible_verbosity else '' }} args:
args: chdir: "{{project_path|quote}}"
chdir: "{{project_path|quote}}" register: galaxy_collection_result
register: galaxy_collection_result with_fileglob:
with_fileglob: - "{{project_path|quote}}/collections/requirements.yaml"
- "{{project_path|quote}}/collections/requirements.yaml" - "{{project_path|quote}}/collections/requirements.yml"
- "{{project_path|quote}}/collections/requirements.yml" - "{{project_path|quote}}/requirements.yaml"
- "{{project_path|quote}}/requirements.yaml" - "{{project_path|quote}}/requirements.yml"
- "{{project_path|quote}}/requirements.yml" changed_when: "'Installing ' in galaxy_collection_result.stdout"
changed_when: "'Installing ' in galaxy_collection_result.stdout" environment: "{{ additional_collections_env | combine(galaxy_task_env) }}"
environment: "{{ additional_collections_env | combine(galaxy_task_env) }}"
when: when:
- "ansible_version.full is version_compare('2.9', '>=')" - "ansible_version.full is version_compare('2.9', '>=')"
- collections_enabled|bool - collections_enabled|bool