openstack/openstack-ansible
Code Issues Proposed changes

Merge "Add default name for user collections file"

Browse Source
This commit is contained in:
Zuul 2023-09-04 17:02:58 +00:00 committed by Gerrit Code Review
commit c0b2fd17d4
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/get-ansible-collection-requirements.yml
View File

@ -100,5 +100,6 @@
collection_file: "{{ playbook_dir }}/../ansible-collection-requirements.yml"
required_collections: "{{ lookup('file', collection_file) | from_yaml }}"
collection_path_default: '/etc/ansible/'
user_collection_file: 'user-collection-requirements.yml'
user_collections: "{{ lookup('file', user_collections_path, errors='ignore')|default([], true) | from_yaml }}"
user_collections_path: "{{ lookup('env', 'OSA_CONFIG_DIR') | default('/etc/openstack_deploy', true) ~ '/' ~ (user_collection_file|default('')) }}"
user_collections_path: "{{ lookup('env', 'OSA_CONFIG_DIR') | default('/etc/openstack_deploy', true) ~ '/' ~ user_collection_file }}"