Skip to content

Commit 3795887

Browse files
committed
Fix aarch64 builds
Those are failing now due to fixed setting of debian_arch variable that was omitted in the general patch. This patch also adds a validation on debian_arch cfg option Change-Id: I372fe0bce4fc502eacce214d24c5bddd198bc33f
1 parent 0246b32 commit 3795887

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

kolla/common/config.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
BASE_OS_DISTRO = ['centos', 'debian', 'rocky', 'ubuntu']
2525
BASE_ARCH = ['x86_64', 'aarch64']
26+
DEBIAN_ARCH = ['amd64', 'arm64']
2627
DEFAULT_BASE_TAGS = {
2728
'centos': {'name': 'quay.io/centos/centos', 'tag': 'stream9'},
2829
'debian': {'name': 'debian', 'tag': 'bookworm'},
@@ -153,7 +154,10 @@
153154
cfg.StrOpt('base-arch', default=hostarch,
154155
choices=BASE_ARCH,
155156
help='The base architecture. Default is same as host.'),
156-
cfg.StrOpt('debian-arch', default=debianarch),
157+
cfg.StrOpt('debian-arch', default=debianarch,
158+
choices=DEBIAN_ARCH,
159+
help='The base architecture used for downloading external '
160+
'packages. Default is derived from base-arch.'),
157161
cfg.BoolOpt('use-dumb-init', default=True,
158162
help='Use dumb-init as init system in containers'),
159163
cfg.BoolOpt('debug', short='d', default=False,
@@ -377,5 +381,3 @@ def parse(conf, args, usage=None, prog=None,
377381

378382
if not conf.base_image:
379383
conf.base_image = DEFAULT_BASE_TAGS[conf.base]['name']
380-
381-
conf.debian_arch = 'amd64'

0 commit comments

Comments
 (0)