Merge "fix: apple silicon architecture selection"

Author: Zuul

kolla/common/config.py

@@ -132,15 +132,16 @@
 ]
 
 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,