aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Nasiadka <mnasiadka@gmail.com>2023-03-16 17:32:32 +0100
committerMichal Nasiadka <mnasiadka@gmail.com>2023-04-13 14:10:28 +0000
commit9867060b6b3bd36aad121b53b9e5dddfca8a8e4c (patch)
tree3ceb8fa160748628472615b30f4d5c25206e81f4
parentb30c7bc87ba4d87a974ef25b2c6585b6b4fda9a3 (diff)
downloadkolla-ansible-9867060b6b3bd36aad121b53b9e5dddfca8a8e4c.tar.gz
kolla-ansible-9867060b6b3bd36aad121b53b9e5dddfca8a8e4c.zip
ansible: bump min to 2.13 and max to 2.14
Change-Id: Ibc9cc91f64b0450de3cae6e2830b4ff2c52c0395
-rw-r--r--ansible/roles/prechecks/vars/main.yml4
-rw-r--r--doc/source/user/quickstart.rst4
-rw-r--r--doc/source/user/virtual-environments.rst2
-rw-r--r--releasenotes/notes/ansible-2.14-d83c5ce197321353.yaml5
-rw-r--r--tests/run.yml8
-rwxr-xr-xtools/kolla-ansible4
6 files changed, 16 insertions, 11 deletions
diff --git a/ansible/roles/prechecks/vars/main.yml b/ansible/roles/prechecks/vars/main.yml
index b55ff5bef..580bb126e 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.12'
-ansible_version_max: '2.13'
+ansible_version_min: '2.13'
+ansible_version_max: '2.14'
# Top level keys should match ansible_facts.distribution.
# These map to lists of supported releases (ansible_facts.distribution_release) or
diff --git a/doc/source/user/quickstart.rst b/doc/source/user/quickstart.rst
index 1254d5762..c84f91fdd 100644
--- a/doc/source/user/quickstart.rst
+++ b/doc/source/user/quickstart.rst
@@ -90,11 +90,11 @@ Install dependencies for the virtual environment
pip install -U pip
#. Install `Ansible <http://www.ansible.com>`__. Kolla Ansible requires at least
- Ansible ``4`` and supports up to ``5``.
+ Ansible ``6`` and supports up to ``7``.
.. code-block:: console
- pip install 'ansible>=4,<6'
+ pip install 'ansible>=6,<8'
Install Kolla-ansible
diff --git a/doc/source/user/virtual-environments.rst b/doc/source/user/virtual-environments.rst
index 5bf780eec..5d52a7e61 100644
--- a/doc/source/user/virtual-environments.rst
+++ b/doc/source/user/virtual-environments.rst
@@ -26,7 +26,7 @@ python virtual environment on the Ansible control host. For example:
source /path/to/venv/bin/activate
pip install -U pip
pip install kolla-ansible
- pip install 'ansible>=4,<6'
+ pip install 'ansible>=6,<8'
deactivate
To use the virtual environment, it should first be activated:
diff --git a/releasenotes/notes/ansible-2.14-d83c5ce197321353.yaml b/releasenotes/notes/ansible-2.14-d83c5ce197321353.yaml
new file mode 100644
index 000000000..5e47c6b95
--- /dev/null
+++ b/releasenotes/notes/ansible-2.14-d83c5ce197321353.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+ - |
+ Minimum supported Ansible version is now ``6`` (ansible-core 2.13)
+ and maximum supported is ``7`` (ansible-core 2.14).
diff --git a/tests/run.yml b/tests/run.yml
index b89b8a261..0c76bf5a0 100644
--- a/tests/run.yml
+++ b/tests/run.yml
@@ -231,20 +231,20 @@
- name: Ensure the latest tested pip
pip:
- name: "pip==22.*"
+ name: "pip==23.*"
state: latest
virtualenv: "{{ kolla_ansible_venv_path }}"
- name: Ensure the latest tested setuptools
pip:
- name: "setuptools==65.*"
+ name: "setuptools==67.2.0"
state: latest
virtualenv: "{{ kolla_ansible_venv_path }}"
- name: install kolla-ansible and dependencies
vars:
- ansible_version_min: "==5.*"
- ansible_version_max: "==6.*"
+ ansible_version_min: "==6.*"
+ ansible_version_max: "==7.*"
# 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 3766db617..579f923e9 100755
--- a/tools/kolla-ansible
+++ b/tools/kolla-ansible
@@ -7,8 +7,8 @@ set -o errexit
# do not use _PYTHON_BIN directly, use $(get_python_bin) instead
_PYTHON_BIN=""
-ANSIBLE_VERSION_MIN=2.12
-ANSIBLE_VERSION_MAX=2.13
+ANSIBLE_VERSION_MIN=2.13
+ANSIBLE_VERSION_MAX=2.14
function get_python_bin {
if [ -n "$_PYTHON_BIN" ]; then