From 3410a6165af199992c0b06eaf603dd0dde72c4b0 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Tue, 15 Jan 2019 15:56:21 -0700 Subject: Add distro_python3 option As we add support for python3 on RHEL based systems, we need to add a flag to key off of in the Dockerfiles to swap out the python3 package names. This change adds a distro_python3 configuration option that can be defined to force python3 or python2 package names. If this option is not provided, we set this to True for RHEL 8 based distros and false for other distros. Change-Id: I4028991bad92c0e8e21066cc4173c06ce5eba393 Related-Blueprint: python3-support --- kolla/common/config.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'kolla/common') diff --git a/kolla/common/config.py b/kolla/common/config.py index 5ba95bd2a..e1c682b4f 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -266,6 +266,10 @@ _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.ListOpt('rpm_setup_config', default=[DELOREAN, DELOREAN_DEPS], help=('Comma separated list of .rpm or .repo file(s) ' 'or URL(s) to install before building containers')), -- cgit v1.2.3