aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2024-07-16 14:39:21 +0000
committerGerrit Code Review <review@openstack.org>2024-07-16 14:39:21 +0000
commit2f28e30912bd06350a4325d2606235197347458d (patch)
tree0e9dfc54ea53052a117c3668fee1c5a05a452bba
parent139851087e15e0aa0c47765768bcdc1da80246d6 (diff)
parent8b98145f23676121002ea654d2806b50e402edec (diff)
downloadkolla-2f28e30912bd06350a4325d2606235197347458d.tar.gz
kolla-2f28e30912bd06350a4325d2606235197347458d.zip
Merge "fix: apple silicon architecture selection"
-rw-r--r--kolla/common/config.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 8d5b6c7f8..fc437aa9a 100644
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -132,15 +132,16 @@ _PROFILE_OPTS = [
]
hostarch = os.uname()[4]
-if hostarch == 'aarch64':
- debianarch = 'arm64'
-elif hostarch == 'x86_64':
- debianarch = 'amd64'
# NOTE: Apple Silicon reports as arm64 which is aarch64
if hostarch == "arm64":
hostarch = "aarch64"
+if hostarch == 'aarch64':
+ debianarch = 'arm64'
+elif hostarch == 'x86_64':
+ debianarch = 'amd64'
+
_CLI_OPTS = [
cfg.StrOpt('base', short='b', default='rocky',
choices=BASE_OS_DISTRO,