diff options
Diffstat (limited to 'doc/source')
| -rw-r--r-- | doc/source/conf.py | 9 | ||||
| -rw-r--r-- | doc/source/user/quickstart-development.rst | 7 | ||||
| -rw-r--r-- | doc/source/user/quickstart.rst | 7 |
3 files changed, 17 insertions, 6 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py index 8458c9627..dc5627d89 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -130,7 +130,16 @@ else: TESTED_RUNTIMES_GOVERNANCE_URL =\ 'https://governance.openstack.org/tc/reference/runtimes/{}.html'.format(KOLLA_OPENSTACK_RELEASE) +ANSIBLE_CORE_VERSION_MIN = '2.15' +ANSIBLE_CORE_VERSION_MAX = '2.16' +ANSIBLE_VERSION_MIN = '8' +ANSIBLE_VERSION_MAX = '9' + GLOBAL_VARIABLE_MAP = { + '|ANSIBLE_CORE_VERSION_MIN|': ANSIBLE_CORE_VERSION_MIN, + '|ANSIBLE_CORE_VERSION_MAX|': ANSIBLE_CORE_VERSION_MAX, + '|ANSIBLE_VERSION_MIN|': ANSIBLE_VERSION_MIN, + '|ANSIBLE_VERSION_MAX|': ANSIBLE_VERSION_MAX, '|KOLLA_OPENSTACK_RELEASE|': KOLLA_OPENSTACK_RELEASE, '|KOLLA_BRANCH_NAME|': KOLLA_BRANCH_NAME, '|KOLLA_BRANCH_NAME_DASHED|': KOLLA_BRANCH_NAME.replace('/', '-'), diff --git a/doc/source/user/quickstart-development.rst b/doc/source/user/quickstart-development.rst index a9c6a32f7..9bb396b2f 100644 --- a/doc/source/user/quickstart-development.rst +++ b/doc/source/user/quickstart-development.rst @@ -90,12 +90,13 @@ Install dependencies for the virtual environment pip install -U pip #. Install `Ansible <http://www.ansible.com>`__. Kolla Ansible requires at least - Ansible ``6`` (or ansible-core ``2.14``) and supports up to ``7`` (or - ansible-core ``2.15``). + Ansible ``|ANSIBLE_VERSION_MIN|`` (or ansible-core + ``|ANSIBLE_CORE_VERSION_MIN|``) and supports up to ``|ANSIBLE_VERSION_MAX|`` + (or ansible-core ``|ANSIBLE_CORE_VERSION_MAX|``). .. code-block:: console - pip install 'ansible-core>=2.14,<2.16' + pip install 'ansible-core>=|ANSIBLE_CORE_VERSION_MIN|,<|ANSIBLE_CORE_VERSION_MAX|.99' Install Kolla-ansible ~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/source/user/quickstart.rst b/doc/source/user/quickstart.rst index 69dc97108..4fab56549 100644 --- a/doc/source/user/quickstart.rst +++ b/doc/source/user/quickstart.rst @@ -90,12 +90,13 @@ Install dependencies for the virtual environment pip install -U pip #. Install `Ansible <http://www.ansible.com>`__. Kolla Ansible requires at least - Ansible ``6`` (or ansible-core ``2.14``) and supports up to ``7`` (or - ansible-core ``2.15``). + Ansible ``|ANSIBLE_VERSION_MIN|`` (or ansible-core + ``|ANSIBLE_CORE_VERSION_MIN|``) and supports up to ``|ANSIBLE_VERSION_MAX|`` + (or ansible-core ``|ANSIBLE_CORE_VERSION_MAX|``). .. code-block:: console - pip install 'ansible-core>=2.14,<2.16' + pip install 'ansible-core>=|ANSIBLE_CORE_VERSION_MIN|,<|ANSIBLE_CORE_VERSION_MAX|.99' Install Kolla-ansible |