diff options
| -rw-r--r-- | ansible/roles/prechecks/vars/main.yml | 4 | ||||
| -rw-r--r-- | doc/source/user/quickstart.rst | 4 | ||||
| -rw-r--r-- | doc/source/user/virtual-environments.rst | 2 | ||||
| -rw-r--r-- | releasenotes/notes/ansible-2.14-d83c5ce197321353.yaml | 5 | ||||
| -rw-r--r-- | tests/run.yml | 8 | ||||
| -rwxr-xr-x | tools/kolla-ansible | 4 |
6 files changed, 11 insertions, 16 deletions
diff --git a/ansible/roles/prechecks/vars/main.yml b/ansible/roles/prechecks/vars/main.yml index 580bb126e..b55ff5bef 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.13' -ansible_version_max: '2.14' +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/doc/source/user/quickstart.rst b/doc/source/user/quickstart.rst index c84f91fdd..1254d5762 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 ``6`` and supports up to ``7``. + Ansible ``4`` and supports up to ``5``. .. code-block:: console - pip install 'ansible>=6,<8' + pip install 'ansible>=4,<6' Install Kolla-ansible diff --git a/doc/source/user/virtual-environments.rst b/doc/source/user/virtual-environments.rst index 5d52a7e61..5bf780eec 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>=6,<8' + pip install 'ansible>=4,<6' 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 deleted file mode 100644 index 5e47c6b95..000000000 --- a/releasenotes/notes/ansible-2.14-d83c5ce197321353.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -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 0c76bf5a0..b89b8a261 100644 --- a/tests/run.yml +++ b/tests/run.yml @@ -231,20 +231,20 @@ - name: Ensure the latest tested pip pip: - name: "pip==23.*" + name: "pip==22.*" state: latest virtualenv: "{{ kolla_ansible_venv_path }}" - name: Ensure the latest tested setuptools pip: - name: "setuptools==67.2.0" + name: "setuptools==65.*" state: latest virtualenv: "{{ kolla_ansible_venv_path }}" - name: install kolla-ansible and dependencies vars: - ansible_version_min: "==6.*" - ansible_version_max: "==7.*" + 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 579f923e9..3766db617 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.13 -ANSIBLE_VERSION_MAX=2.14 +ANSIBLE_VERSION_MIN=2.12 +ANSIBLE_VERSION_MAX=2.13 function get_python_bin { if [ -n "$_PYTHON_BIN" ]; then |