diff --git a/docs/rolereference.rst b/docs/rolereference.rst index d6e99de6cf3c25b15b0f8e2cea4aa6b0190b454c..3fe7ddcd9e804ff2b6b3fff372ad81a2fe9540fe 100644 --- a/docs/rolereference.rst +++ b/docs/rolereference.rst @@ -272,9 +272,9 @@ The role implements the following: upgrades on daily basis. Mails are delivered to local ``root`` account, and can be redirected elsewhere via aliases. If using ``mail_forwarder`` or ``mail_server`` roles on the same server, aliases can be set-up through them. -* Sets-up system for performing checks on pip requirements files. Only - Python 3 is supported. Roles that want their requirements files - checked should create a sub-directory inside of +* Sets-up system for performing checks on pip requirements + files. Roles that want their requirements files checked should + create a sub-directory inside of ``/etc/pip_check_requirements_upgrades``, and place ``.txt`` and ``.in`` files inside (with same base name). The ``.txt`` files should be standard requirements files with fixed versions (the ones @@ -417,11 +417,11 @@ Parameters **pip_check_requirements_in** (list, optional, ``[pip, pip-tools, setuptools, wheel]``) List of Python package requirements inputs to use for checking for - package upgrades for the Python 3 virtual environment used to run + package upgrades for the Python virtual environment used to run the check itself. **pip_check_requirements** (list, optional, ``see below``) - List of Python package requirements to install in Python 3 virtual + List of Python package requirements to install in Python virtual environment in order to be able to run the ``pip-tools`` applications as part of pip requirements upgrade checks. This list needs to be updated from time to time as the new releases of diff --git a/docs/usage.rst b/docs/usage.rst index 235c20327468f44ed6727da3dd811be8343e100e..79fbc966e997dc8e9af7f4c21b52b04568f57c67 100644 --- a/docs/usage.rst +++ b/docs/usage.rst @@ -28,19 +28,6 @@ By the end of following the instructions, you will have the following: * Web server, providing the web services. * Backup server, used for storing all of the backups. -.. warning:: - Majic Ansible Roles support *only* Python 3 - both on the - controller side and on the managed servers side. - - It is important to make sure that both the controller Python - virtual environment used for Ansible *and* the interpreter for - remote servers are *both* set-up to use Python 3. - - Python 3 is specified explicitly during virtual environment - creation and in ``ansible.cfg`` configuration file - (``interpreter_python`` option under ``defaults`` section). - - Pre-requisites --------------