From ab679adcbfaa251b2de00daa0acdbb7771a8ae04 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 9 Jan 2019 16:42:17 +0100 Subject: debian/ubuntu: introduce 'debian_arch' variable Many images have 'if x86_64 then amd64 elif aarch64 then arm64' check to comply with Debian like architecture names in several projects. This patch creates 'debian_arch' variable which can be used in all Docker files (similar to 'base_arch' one). All required images got converted to use it. Change-Id: I9c5e6f13d6c9b24fe323408512bd5aef290111ad --- kolla/image/build.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'kolla') diff --git a/kolla/image/build.py b/kolla/image/build.py index eb5512dc0..b3ed5e5c2 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -679,6 +679,11 @@ class KollaWorker(object): self.install_type = conf.install_type self.tag = conf.tag self.base_arch = conf.base_arch + self.debian_arch = self.base_arch + if self.base_arch == 'aarch64': + self.debian_arch = 'arm64' + elif self.base_arch == 'x86_64': + self.debian_arch = 'amd64' self.images = list() rpm_setup_config = ([repo_file for repo_file in conf.rpm_setup_config if repo_file is not None]) @@ -900,6 +905,7 @@ class KollaWorker(object): 'base_distro_tag': self.base_tag, 'base_arch': self.base_arch, 'base_package_type': self.base_package_type, + 'debian_arch': self.debian_arch, 'supported_distro_release': supported_distro_release, 'install_metatype': self.install_metatype, 'image_prefix': self.image_prefix, -- cgit v1.2.3