!88 make the same authentication behavior for arm and x86 machine

From: @wanglmb 
Reviewed-by: @xiezhipeng1 
Signed-off-by: @xiezhipeng1

cloud-init.spec

@@ -1,6 +1,6 @@
 Name: cloud-init
 Version: 21.4
-Release: 6
+Release: 7
 Summary: the defacto multi-distribution package that handles early initialization of a cloud instance.
 License: ASL 2.0 or GPLv3
 URL: http://launchpad.net/cloud-init
@@ -18,6 +18,7 @@ Patch6: backport-testing-add-additional-mocks-to-test_net-tests-1356.patch
 Patch7: delete-config-nopasswd-all.patch
 
 Patch9000: Fix-the-error-level-logs-displayed-for-the-cloud-init-local-service.patch
+Patch9001: set-same-DI_DEFAULT_POLICY-for-aarch64-and-x86_64.patch
 
 BuildRequires: pkgconfig(systemd) python3-devel python3-setuptools systemd
 BuildRequires: iproute python3-configobj python3-httpretty >= 0.8.14-2
@@ -127,6 +128,9 @@ fi
 %exclude /usr/share/doc/*
 
 %changelog
+* Wed Dec 21 2022 wanglimin<wanglimin@xfusion.com> - 21.4-7
+- make the same authentication behavior for arm and x86 machine
+
 * Tue Dec 20 2022 xuxinyu <xuxinyu@xfusion.com> - 21.4-6
 - Type:security
 - CVE:

set-same-DI_DEFAULT_POLICY-for-aarch64-and-x86_64.patch

@@ -0,0 +1,24 @@
+diff --git a/tools/ds-identify b/tools/ds-identify
+index 30d4b0f..0611aba 100644
+--- a/tools/ds-identify
++++ b/tools/ds-identify
+@@ -1220,7 +1220,7 @@ dscheck_OpenStack() {
+ 
+     # LP: #1715241 : arch other than intel are not identified properly.
+     case "$DI_UNAME_MACHINE" in
+-        i?86|x86_64) :;;
++        i?86|x86_64|aarch64) :;;
+         *) return ${DS_MAYBE};;
+     esac
+ 
+@@ -1636,9 +1636,7 @@ parse_policy() {
+     local def=""
+     case "$DI_UNAME_MACHINE" in
+         # these have dmi data
+-        i?86|x86_64) def=${DI_DEFAULT_POLICY};;
+-        # aarch64 has dmi, but not currently used (LP: #1663304)
+-        aarch64) def=${DI_DEFAULT_POLICY_NO_DMI};;
++        i?86|x86_64|aarch64) def=${DI_DEFAULT_POLICY};;
+         *) def=${DI_DEFAULT_POLICY_NO_DMI};;
+     esac
+     local policy="$1"