diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2022-09-07 18:56:19 +0200 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2022-10-04 11:45:28 +0000 |
| commit | 98a691a7c99f33b3c5050acf2d85c783ba0712fe (patch) | |
| tree | 0657b76c562dfd684974197f9dc6cbd70eea0a6d | |
| parent | 0052deac23c8e31c1dcbf47cc0c4664643303c13 (diff) | |
| download | kolla-ansible-98a691a7c99f33b3c5050acf2d85c783ba0712fe.tar.gz kolla-ansible-98a691a7c99f33b3c5050acf2d85c783ba0712fe.zip | |
Bump Ansible min version to 2.12/5 and max to 2.13/6
Change-Id: Ie09bf108250a71d539002dd5ccfa63dd71bcfe90
| -rw-r--r-- | ansible/library/kolla_container_facts.py | 2 | ||||
| -rw-r--r-- | ansible/library/kolla_docker.py | 2 | ||||
| -rw-r--r-- | ansible/library/kolla_toolbox.py | 2 | ||||
| -rw-r--r-- | ansible/roles/prechecks/vars/main.yml | 4 | ||||
| -rw-r--r-- | tests/run.yml | 4 | ||||
| -rwxr-xr-x | tools/kolla-ansible | 4 |
6 files changed, 9 insertions, 9 deletions
diff --git a/ansible/library/kolla_container_facts.py b/ansible/library/kolla_container_facts.py index 0e0c9b427..589755104 100644 --- a/ansible/library/kolla_container_facts.py +++ b/ansible/library/kolla_container_facts.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright 2016 99cloud # diff --git a/ansible/library/kolla_docker.py b/ansible/library/kolla_docker.py index cdd77f413..49a5bdf88 100644 --- a/ansible/library/kolla_docker.py +++ b/ansible/library/kolla_docker.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright 2015 Sam Yaple # diff --git a/ansible/library/kolla_toolbox.py b/ansible/library/kolla_toolbox.py index 3a613ef01..7ad3aa99f 100644 --- a/ansible/library/kolla_toolbox.py +++ b/ansible/library/kolla_toolbox.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright 2016 99cloud Inc. # diff --git a/ansible/roles/prechecks/vars/main.yml b/ansible/roles/prechecks/vars/main.yml index 752d5ac8d..d31e1349b 100644 --- a/ansible/roles/prechecks/vars/main.yml +++ b/ansible/roles/prechecks/vars/main.yml @@ -1,8 +1,8 @@ --- docker_version_min: '18.09' docker_py_version_min: '3.4.1' -ansible_version_min: '2.11' -ansible_version_max: '2.12' +ansible_version_min: '2.12' +ansible_version_max: '2.13' # Top level keys should match ansible_facts.distribution. # These map to lists of supported releases (ansible_facts.distribution_release) or diff --git a/tests/run.yml b/tests/run.yml index 0a23066ac..bc0163591 100644 --- a/tests/run.yml +++ b/tests/run.yml @@ -243,8 +243,8 @@ - name: install kolla-ansible and dependencies vars: - ansible_version_min: "==4.*" - ansible_version_max: "==5.*" + ansible_version_min: "==5.*" + ansible_version_max: "==6.*" # Test latest ansible version on Ubuntu, minimum supported on others. ansible_version_constraint: >- {{ ansible_version_min if is_upgrade or base_distro != 'ubuntu' else ansible_version_max }} diff --git a/tools/kolla-ansible b/tools/kolla-ansible index 4a417b727..0de653067 100755 --- a/tools/kolla-ansible +++ b/tools/kolla-ansible @@ -68,8 +68,8 @@ function check_environment_coherence { exit 1 fi - local ANSIBLE_VERSION_MIN=2.11 - local ANSIBLE_VERSION_MAX=2.12 + local ANSIBLE_VERSION_MIN=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" ]] || [[ $(printf "%s\n" "$ANSIBLE_VERSION_MIN" "$ANSIBLE_VERSION_MAX" "$ansible_version" | sort -V | tail -n1) != "$ANSIBLE_VERSION_MAX" ]]; then |