openstack
/
openstack-ansible
Code Issues Proposed changes

Merge "Align collection_file naming"

This commit is contained in:
Zuul 2022-05-27 18:19:18 +00:00 committed by Gerrit Code Review
parent f1af818619 d501eadd94
commit 34ca646ece
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/bootstrap-ansible.sh
View File

@ -54,6 +54,7 @@ export OSA_CLONE_DIR="$(pwd)"
# Set the variable to the role file to be the absolute path
ANSIBLE_ROLE_FILE="$(readlink -f "${ANSIBLE_ROLE_FILE}")"
ANSIBLE_COLLECTION_FILE="$(readlink -f "${ANSIBLE_COLLECTION_FILE}")"
OSA_INVENTORY_PATH="$(readlink -f inventory)"
OSA_ANSIBLE_PYTHON_INTERPRETER="auto"

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

@ -97,8 +97,8 @@
state: absent
vars:
collections_file: "{{ playbook_dir }}/../ansible-collection-requirements.yml"
required_collections: "{{ lookup('file', collections_file) | from_yaml }}"
collection_file: "{{ playbook_dir }}/../ansible-collection-requirements.yml"
required_collections: "{{ lookup('file', collection_file) | from_yaml }}"
collection_path_default: '/etc/ansible/'
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('')) }}"