diff --git a/README.rst b/README.rst index 8c9ac3b..4007966 100644 --- a/README.rst +++ b/README.rst @@ -342,11 +342,16 @@ Python 3 Support Some distributions support installing Salt to use Python 3 instead of Python 2. The availability of this offering, while limited, is as follows: +- CentOS 6 - CentOS 7 - Debian 9 +- Fedora - Ubuntu 16.04 - Ubuntu 18.04 +The Fedora and CentOS 6 options only support git installations. +On Fedora 28, PIP installation must be allowed (-P) due to incompatibility with the shipped Tornado library. + Installing the Python 3 packages for Salt is done via the ``-x`` option: .. code:: console diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 407f977..549b703 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -381,8 +381,8 @@ __usage() { a complete overwrite of the file. -q Quiet salt installation from git (setup.py install -q) -x Changes the Python version used to install Salt. Currently, this is only - supported on CentOS 7, Debian 9, Ubuntu 16 and CentOS 6. The CentOS 6 - option only works with git installations. + supported on CentOS 6+, Debian 9+, Ubuntu 16+, and Fedora. + The Fedora and CentOS 6 options only work with git installations. -y Installs a different python version on host. Currently this has only been tested with CentOS 6 and is considered experimental. This will install the ius repo on the box if disable repo is false. This must be used in conjunction