openstack/kolla
Code Issues Proposed changes

Merge "fix: apple silicon architecture selection"

Browse Source
This commit is contained in:
Zuul 2024-07-16 14:39:21 +00:00 committed by Gerrit Code Review
commit 2f28e30912
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kolla/common/config.py
View File

@ -132,15 +132,16 @@ _PROFILE_OPTS = [
] ]
hostarch = os.uname()[4] hostarch = os.uname()[4]
if hostarch == 'aarch64':
debianarch = 'arm64'
elif hostarch == 'x86_64':
debianarch = 'amd64'
# NOTE: Apple Silicon reports as arm64 which is aarch64 # NOTE: Apple Silicon reports as arm64 which is aarch64
if hostarch == "arm64": if hostarch == "arm64":
hostarch = "aarch64" hostarch = "aarch64"
if hostarch == 'aarch64':
debianarch = 'arm64'
elif hostarch == 'x86_64':
debianarch = 'amd64'
_CLI_OPTS = [ _CLI_OPTS = [
cfg.StrOpt('base', short='b', default='rocky', cfg.StrOpt('base', short='b', default='rocky',
choices=BASE_OS_DISTRO, choices=BASE_OS_DISTRO,