diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2019-03-08 13:19:03 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2019-03-12 17:13:46 +0000 |
| commit | 8df6eb01184672ffdc752437ea4d98d13f16026e (patch) | |
| tree | e4121f587d342afa739a6ffde89074d978eea648 /kolla/common | |
| parent | 8ae32bb17258a2211e03592bfaae6c648cda6089 (diff) | |
| download | kolla-8df6eb01184672ffdc752437ea4d98d13f16026e.tar.gz kolla-8df6eb01184672ffdc752437ea4d98d13f16026e.zip | |
replace 'distro_python3' variable with 'distro_python_version'
RHEL7 derived distros use Python 2.7
RHEL8 uses Python 3.6
Ubuntu 18.04 uses Python 3.6, but we haven't enabled it yet.
Debian:buster uses Python 3.7, but we haven't enabled it yet.
We have several places in code where "/lib/pythonX.Y/site-packages"
is used so we need to know value of X.Y rather than py2/py3 switch.
How to check for Python 2:
{% if distro_python_version == '2.7' %}
Breaks: Iad6b70b433a0dd1b0f8ae6790fd280594517661a
Change-Id: Ie24f109af19ae0438c21e0d43cb3cc947812b4ce
Diffstat (limited to 'kolla/common')
| -rwxr-xr-x | kolla/common/config.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index 5d1082f65..05ccb13e0 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -266,10 +266,6 @@ _BASE_OPTS = [ cfg.StrOpt('maintainer', default='Kolla Project (https://launchpad.net/kolla)', help='Content of the maintainer label'), - cfg.BoolOpt('distro_python3', default=None, - help=('Enable this to force python3 packaging names. By ' - 'default this will try and determine the value of this ' - 'based on the base_distro and base_distro_tag.')), cfg.StrOpt('base_package_type', default=None, help=('Set the package type of the distro. If not set then ' 'the packaging type is set to "rpm" if a RHEL based ' |