diff options
| author | Bartosz Bezak <bartosz@stackhpc.com> | 2025-01-09 12:49:25 +0100 |
|---|---|---|
| committer | Bartosz Bezak <bartosz@stackhpc.com> | 2025-03-21 17:06:14 +0000 |
| commit | 915189d10be83136d54f4216b81310b3dd16b82d (patch) | |
| tree | 487695cfe1cc810597c4fd107b6d5ef8b3e92d6a /kolla | |
| parent | ad300f6daeb0a31358a8b8653cb7eb35f1a1c46b (diff) | |
| download | kolla-915189d10be83136d54f4216b81310b3dd16b82d.tar.gz kolla-915189d10be83136d54f4216b81310b3dd16b82d.zip | |
fix sources.py based cross-arch builds
Derive debian_arch from base_arch by default when not set by the user.
This ensures that cross-architecture builds correctly download
the appropriate binaries, while preserving any explicit user override.
Closes-Bug: #2103810
Change-Id: I11b7e19ac3a12147138a98fc1e030767f70b44c9
Diffstat (limited to 'kolla')
| -rw-r--r-- | kolla/common/config.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index c0aa8370a..1b2c547f9 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -392,6 +392,9 @@ def parse(conf, args, usage=None, prog=None, openstack_branch_slashed = openstack_branch.replace('-', '/') conf.set_default('openstack_branch', openstack_branch) conf.set_default('openstack_branch_slashed', openstack_branch_slashed) + # NOTE(bbezak) Derive debian_arch from base_arch if not set explicitly + derived_arch = 'arm64' if conf.base_arch == 'aarch64' else 'amd64' + conf.set_default('debian_arch', derived_arch) if not conf.base_image: conf.base_image = DEFAULT_BASE_TAGS[conf.base]['name'] |