Fix the distro.osfamily output problem

backport-Fix-the-distro.osfamily-output-problem.patch

@@ -0,0 +1,44 @@
+From a6fd6ef3af0361c860de62d804dd584052f8a563 Mon Sep 17 00:00:00 2001
+From: sxt1001 <shixuantong1@huawei.com>
+Date: Mon, 12 Dec 2022 23:43:59 +0800
+Subject: [PATCH] Fix the distro.osfamily output problem in the openEuler
+ system. (#1895)
+
+LP: #1999042
+---
+ cloudinit/distros/__init__.py  | 3 ++-
+ cloudinit/distros/openEuler.py | 4 +++-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py
+index d91aab2..4ab7ae3 100755
+--- a/cloudinit/distros/__init__.py
++++ b/cloudinit/distros/__init__.py
+@@ -50,8 +50,9 @@ OSFAMILIES = {
+     'freebsd': ['freebsd'],
+     'gentoo': ['gentoo'],
+     'redhat': ['almalinux', 'amazon', 'centos', 'cloudlinux', 'eurolinux',
+-               'fedora', 'openeuler', 'photon', 'rhel', 'rocky', 'virtuozzo'],
++               'fedora', 'photon', 'rhel', 'rocky', 'virtuozzo'],
+     'suse': ['opensuse', 'sles'],
++    "openEuler": ["openEuler"],
+ }
+ 
+ LOG = logging.getLogger(__name__)
+diff --git a/cloudinit/distros/openEuler.py b/cloudinit/distros/openEuler.py
+index edb3165..a4e8757 100644
+--- a/cloudinit/distros/openEuler.py
++++ b/cloudinit/distros/openEuler.py
+@@ -4,6 +4,8 @@ from cloudinit.distros import rhel
+ 
+ 
+ class Distro(rhel.Distro):
+-    pass
++    def __init__(self, name, cfg, paths):
++        super(Distro, self).__init__(name, cfg, paths)
++        self.osfamily = "openEuler"
+ 
+ # vi: ts=4 expandtab
+-- 
+2.33.0
+

cloud-init.spec

@@ -1,6 +1,6 @@
 Name: cloud-init
 Version: 21.4
-Release: 8
+Release: 9
 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
 Patch8: backport-net-netplan-config-root-read-only-as-wifi-config-can.patch
 Patch9: backport-netplan-define-features.NETPLAN_CONFIG_ROOT_READ_ONL.patch
+Patch10: backport-Fix-the-distro.osfamily-output-problem.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
@@ -130,6 +131,9 @@ fi
 %exclude /usr/share/doc/*
 
 %changelog
+* Fri Jan 06 2023 shixuantong <shixuantong1@huawei.com> - 21.4-9
+- Fix the distro.osfamily output problem
+
 * Thu Jan 05 2023 shixuantong <shixuantong1@huawei.com> - 21.4-8
 - Limit permissions for /etc/network/50-cloud-init.yaml as read-only for root (600)