openstack/kolla-ansible
Code Issues Proposed changes

Merge "Bump Ansible min version to 2.12/5 and max to 2.13/6"

Browse Source
This commit is contained in:
Zuul 2022-10-05 18:04:38 +00:00 committed by Gerrit Code Review
commit 17aeda1fcf
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/library/kolla_container_facts.py
View File

@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python3
# Copyright 2016 99cloud # Copyright 2016 99cloud
# #

2
ansible/library/kolla_docker.py
View File

@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python3
# Copyright 2015 Sam Yaple # Copyright 2015 Sam Yaple
# #

2
ansible/library/kolla_toolbox.py
View File

@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python3
# Copyright 2016 99cloud Inc. # Copyright 2016 99cloud Inc.
# #

4
ansible/roles/prechecks/vars/main.yml
View File

@ -1,8 +1,8 @@
--- ---
docker_version_min: '18.09' docker_version_min: '18.09'
docker_py_version_min: '3.4.1' docker_py_version_min: '3.4.1'
ansible_version_min: '2.11' ansible_version_min: '2.12'
ansible_version_max: '2.12' ansible_version_max: '2.13'
# Top level keys should match ansible_facts.distribution. # Top level keys should match ansible_facts.distribution.
# These map to lists of supported releases (ansible_facts.distribution_release) or # These map to lists of supported releases (ansible_facts.distribution_release) or

4
tests/run.yml
View File

@ -243,8 +243,8 @@
- name: install kolla-ansible and dependencies - name: install kolla-ansible and dependencies
vars: vars:
ansible_version_min: "==4.*" ansible_version_min: "==5.*"
ansible_version_max: "==5.*" ansible_version_max: "==6.*"
# Test latest ansible version on Ubuntu, minimum supported on others. # Test latest ansible version on Ubuntu, minimum supported on others.
ansible_version_constraint: >- ansible_version_constraint: >-
{{ ansible_version_min if is_upgrade or base_distro != 'ubuntu' else ansible_version_max }} {{ ansible_version_min if is_upgrade or base_distro != 'ubuntu' else ansible_version_max }}

4
tools/kolla-ansible
View File

@ -68,8 +68,8 @@ function check_environment_coherence {
exit 1 exit 1
fi fi
local ANSIBLE_VERSION_MIN=2.11 local ANSIBLE_VERSION_MIN=2.12
local ANSIBLE_VERSION_MAX=2.12 local ANSIBLE_VERSION_MAX=2.13
if [[ $(printf "%s\n" "$ANSIBLE_VERSION_MIN" "$ANSIBLE_VERSION_MAX" "$ansible_version" | sort -V | head -n1) != "$ANSIBLE_VERSION_MIN" ]] || if [[ $(printf "%s\n" "$ANSIBLE_VERSION_MIN" "$ANSIBLE_VERSION_MAX" "$ansible_version" | sort -V | head -n1) != "$ANSIBLE_VERSION_MIN" ]] ||
[[ $(printf "%s\n" "$ANSIBLE_VERSION_MIN" "$ANSIBLE_VERSION_MAX" "$ansible_version" | sort -V | tail -n1) != "$ANSIBLE_VERSION_MAX" ]]; then [[ $(printf "%s\n" "$ANSIBLE_VERSION_MIN" "$ANSIBLE_VERSION_MAX" "$ansible_version" | sort -V | tail -n1) != "$ANSIBLE_VERSION_MAX" ]]; then