diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2023-09-25 14:03:34 +0000 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2023-11-08 09:52:20 +0000 |
| commit | bc203433f1120373fbe751521eafc6cd3a3ee336 (patch) | |
| tree | b92a9ecdf655acd6e7e18079ce65de3975b43a11 /tools | |
| parent | 37c2ab2aaafa06b40ba1c32a29699fbd8ee17b87 (diff) | |
| download | kolla-ansible-bc203433f1120373fbe751521eafc6cd3a3ee336.tar.gz kolla-ansible-bc203433f1120373fbe751521eafc6cd3a3ee336.zip | |
Add support for ansible-core
Collections version taken from official Ansible 7 package [1]
and limited to the same major version.
[1]: https://github.com/ansible-community/ansible-build-data/blob/main/7/ansible-7.7.0.yaml
Change-Id: I0f1ea9717397adc2d2c3215d74ec3759f351a57a
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/kolla-ansible | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/kolla-ansible b/tools/kolla-ansible index 0fa247da2..07b43cf6c 100755 --- a/tools/kolla-ansible +++ b/tools/kolla-ansible @@ -130,7 +130,13 @@ function find_base_dir { function install_deps { echo "Installing Ansible Galaxy dependencies" - ansible-galaxy collection install -r ${BASEDIR}/requirements.yml --force + if pip show ansible 2>/dev/null; then + ansible-galaxy collection install -r ${BASEDIR}/requirements.yml --force + else + ansible-galaxy collection install -r ${BASEDIR}/requirements.yml --force + ansible-galaxy collection install -r ${BASEDIR}/requirements-core.yml --force + fi + if [[ $? -ne 0 ]]; then echo "ERROR: Failed to install Ansible Galaxy dependencies" >&2 exit 1 |