From fca732b81e4eb5daa56da16e338bdd305a56d5bd Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Tue, 15 Jan 2019 16:33:24 -0700 Subject: Add base_package_type Currently in all the Dockerfile.j2 files, we are doing base distro if conditions for package names when installing via a binary. Rather than duplicating these base_distro in [], let's provide a single value for determining the binary installation method. This change adds a base_package_type which we can use to lookup if 'rpm' or if 'deb' rather than relying on specific distro names. Change-Id: I8a0c6c8fbc32a8cfa6932fddf28a449fceda3d49 --- 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 e1c682b4f..5d1082f65 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -270,6 +270,10 @@ _BASE_OPTS = [ 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 ' + 'distro and "deb" if a Debian based distro.')), 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