diff --git a/ansible/library/kolla_container_facts.py b/ansible/library/kolla_container_facts.py index 0e0c9b4272bae5a15092a8a9e12f4cc6292b1f60..589755104bf4ef24455cb3b5604cb796d5fe0fb6 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 cdd77f413fb1eeac8e443f0231bf7d0690b0d351..49a5bdf887c76bb5386eb7c92545f89ad6832348 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 3a613ef01d36b7dcb1b99e188dfa627ebe95c2b2..7ad3aa99f1ac1ea421cadeb3fe61220b941f5c48 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 752d5ac8d788f8c9490a4a6d9cb2a502e848dc20..d31e1349b82b162dc284c6ffeaa1e0dc6a2d7c9f 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 0a23066ac772259d9be60fe2663bc395a232ab4c..bc01635911e83d5f3a7f8d9e44b078070a0fae9e 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 4a417b727d4254bf88de8f112abc6d7cce6f9233..0de653067bda6a2b399f72c02acc9a826f12e448 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