diff --git a/ansible/roles/prechecks/vars/main.yml b/ansible/roles/prechecks/vars/main.yml index fd2237209ddfb93ade68bc3aa82d280bc0ea8d25..c612c5530c6a0f60141fc56e4765206e5ef0bbd3 100644 --- a/ansible/roles/prechecks/vars/main.yml +++ b/ansible/roles/prechecks/vars/main.yml @@ -1,4 +1,4 @@ --- docker_version_min: '1.10.0' -docker_py_version_min: '1.6.0' +docker_py_version_min: '1.8.1' ansible_version_min: '2.0.0' diff --git a/doc/quickstart.rst b/doc/quickstart.rst index 3bd54950107eba5de6ab8fb4e6e80d0d5d4997f2..c987dfdf8d565f1d848674c8d3b2c83d2fab1a03 100644 --- a/doc/quickstart.rst +++ b/doc/quickstart.rst @@ -76,8 +76,7 @@ Docker Python 1.6.0 none On target nodes Python Jinja2 2.6.0 none On deployment host ===================== =========== =========== ========================= -Dependencies for the stable/newton branch and later (including master branch) -are: +Dependencies for the stable/newton are: ===================== =========== =========== ========================= Component Min Version Max Version Comment @@ -88,6 +87,18 @@ Docker Python 1.6.0 none On target nodes Python Jinja2 2.8.0 none On deployment host ===================== =========== =========== ========================= +Dependencies for the stable/ocata branch and later (including master branch) +are: + +===================== =========== =========== ========================= +Component Min Version Max Version Comment +===================== =========== =========== ========================= +Ansible 2.0.0 none On deployment host +Docker 1.10.0 none On target nodes +Docker Python 1.8.1 none On target nodes +Python Jinja2 2.8.0 none On deployment host +===================== =========== =========== ========================= + Make sure the ``pip`` package manager is installed and upgraded to the latest before proceeding: