Py3/-x doc clarification

This commit is contained in:
Ronald van Zantvoort 2018-08-09 21:12:57 +02:00
parent 3785e67c43
commit b8e6a96451
No known key found for this signature in database
GPG key ID: D3DE53B7EFF75061
2 changed files with 4 additions and 6 deletions

View file

@ -342,14 +342,12 @@ Python 3 Support
Some distributions support installing Salt to use Python 3 instead of Python 2. The availability of Some distributions support installing Salt to use Python 3 instead of Python 2. The availability of
this offering, while limited, is as follows: this offering, while limited, is as follows:
- CentOS 6
- CentOS 7 - CentOS 7
- Debian 9 - Debian 9
- Fedora - Fedora (only git installations)
- Ubuntu 16.04 - Ubuntu 16.04
- Ubuntu 18.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. 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: Installing the Python 3 packages for Salt is done via the ``-x`` option:

View file

@ -380,9 +380,9 @@ __usage() {
no ".bak" file will be created as either of those options will force no ".bak" file will be created as either of those options will force
a complete overwrite of the file. a complete overwrite of the file.
-q Quiet salt installation from git (setup.py install -q) -q Quiet salt installation from git (setup.py install -q)
-x Changes the Python version used to install Salt. Currently, this is only -x Changes the Python version used to install Salt.
supported on CentOS 6+, Debian 9+, Ubuntu 16+, and Fedora. For CentOS 6 git installations python2.7 is supported.
The Fedora and CentOS 6 options only work with git installations. Fedora git installation, CentOS 7, Debian 9, Ubuntu 16.04 and 18.04 support python3.
-y Installs a different python version on host. Currently this has only been -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 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 ius repo on the box if disable repo is false. This must be used in conjunction