Merge "Bump up supported Ansible version to 2.10"

ansible/roles/prechecks/vars/main.yml

@@ -2,7 +2,7 @@
 docker_version_min: '1.10.0'
 docker_py_version_min: '2.0.0'
 ansible_version_min: '2.9'
-ansible_version_max: '2.9'
+ansible_version_max: '2.10'
 
 # Top level keys should match ansible_distribution.
 # These map to lists of supported releases (ansible_distribution_release) or

doc/source/user/quickstart.rst

@@ -89,11 +89,11 @@ If not installing Kolla Ansible in a virtual environment, skip this section.
       pip install -U pip
 
 #. Install `Ansible <http://www.ansible.com>`__. Kolla Ansible requires at least
-   Ansible ``2.9`` and supports up to ``2.9``.
+   Ansible ``2.9`` and supports up to ``2.10``.
 
    .. code-block:: console
 
-      pip install 'ansible<2.10'
+      pip install 'ansible<3.0'
 
 Install dependencies not using a virtual environment
 ----------------------------------------------------
@@ -121,7 +121,7 @@ If installing Kolla Ansible in a virtual environment, skip this section.
       sudo pip3 install -U pip
 
 #. Install `Ansible <http://www.ansible.com>`__. Kolla Ansible requires at least
-   Ansible ``2.9`` and supports up to ``2.9``.
+   Ansible ``2.9`` and supports up to ``2.10``.
 
    For CentOS or RHEL, run:
 
@@ -138,7 +138,7 @@ If installing Kolla Ansible in a virtual environment, skip this section.
    .. note::
 
       If the installed Ansible version does not meet the requirements, one can
-      use pip: ``sudo pip install -U 'ansible<2.10'``.
+      use pip: ``sudo pip install -U 'ansible<3.0'``.
       Beware system package upgrades might interfere with that so it
       is recommended to uninstall the system package first. One might be better
       off with the virtual environment method to avoid this pitfall.

test-requirements.txt

@@ -13,4 +13,4 @@ coverage!=4.4,>=4.0 # Apache-2.0
 docker>=2.4.2 # Apache-2.0
 oslotest>=3.2.0 # Apache-2.0
 stestr>=2.0.0 # Apache-2.0
-ansible>=2.9.0,<2.10 # GPLv3
+ansible>=2.9.0,<3.0 # GPLv3

tests/run.yml

@@ -204,7 +204,7 @@
     - name: install kolla-ansible and dependencies
       vars:
         # Test latest ansible version on Ubuntu, minimum supported on others.
-        ansible_version_constraint: "==2.9.*"
+        ansible_version_constraint: "{{ '==2.9.*' if is_upgrade else '==2.10.*' }}"
       pip:
         name:
           - "{{ kolla_ansible_src_dir }}"

tools/kolla-ansible

@@ -55,7 +55,7 @@ function check_environment_coherence {
     fi
 
     local ANSIBLE_VERSION_MIN=2.9
-    local ANSIBLE_VERSION_MAX=2.9
+    local ANSIBLE_VERSION_MAX=2.10
 
     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