aboutsummaryrefslogtreecommitdiff
path: root/kolla/image
diff options
context:
space:
mode:
authorAlex Schultz <aschultz@redhat.com>2019-02-25 16:04:39 -0700
committerAlex Schultz <aschultz@redhat.com>2019-03-12 18:24:29 +0000
commit78c819d6232b3fa5c6fb6aa5ea85a54c596f0b56 (patch)
tree1bf168eae2fb5f47b01cccb2677c94a82a406439 /kolla/image
parent3e5d8e2653db1c6c28cb428f81cd0bc332c623c3 (diff)
downloadkolla-78c819d6232b3fa5c6fb6aa5ea85a54c596f0b56.tar.gz
kolla-78c819d6232b3fa5c6fb6aa5ea85a54c596f0b56.zip
Add distro_package_manager configuration
Add configuration to allow the switch between dnf/yum or provide an alternative package manager. Change-Id: I913769fcf5875a12b4561958cf7c90b74cd116ea
Diffstat (limited to 'kolla/image')
-rwxr-xr-xkolla/image/build.py13
1 files changed, 13 insertions, 0 deletions
diff --git a/kolla/image/build.py b/kolla/image/build.py
index 624db3406..7c85f8cdc 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -29,6 +29,7 @@ import tempfile
import threading
import time
+from distutils.version import LooseVersion
from distutils.version import StrictVersion
import docker
import git
@@ -701,6 +702,17 @@ class KollaWorker(object):
# Assume worst
self.conf.distro_python_version = "2.7"
+ if self.conf.distro_package_manager is not None:
+ package_manager = self.conf.distro_package_manager
+ elif self.base in rh_base:
+ if LooseVersion(self.base_tag) >= LooseVersion('8'):
+ package_manager = 'dnf'
+ else:
+ package_manager = 'yum'
+ elif self.base in deb_base:
+ package_manager = 'apt'
+ self.distro_package_manager = package_manager
+
# Determine base packaging type for use in Dockerfiles.
if self.conf.base_package_type:
self.base_package_type = self.conf.base_package_type
@@ -917,6 +929,7 @@ class KollaWorker(object):
'image_name': image_name,
'users': self.get_users(),
'distro_python_version': self.distro_python_version,
+ 'distro_package_manager': self.distro_package_manager,
'rpm_setup': self.rpm_setup,
'build_date': build_date}
env = jinja2.Environment( # nosec: not used to render HTML