packages/cloud-init
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!41 Fix the error level logs displayed for the cloud-init-local service

Browse Source 
From: @yang_zhuang_zhuang
Reviewed-by: @overweight
Signed-off-by: @overweight
This commit is contained in:
openeuler-ci-bot 2021-05-25 17:00:41 +08:00 committed by Gitee
commit 16ab20cd54
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Fix-the-error-level-logs-displayed-for-the-cloud-init-local-service.patch Normal file
View File

@ -0,0 +1,30 @@
From 2009784e662c03d8d223161c003959511be31518 Mon Sep 17 00:00:00 2001
From: yang_zhuang_zhuang <yangzhuangzhuang1@huawei.com>
Date: Thu, 18 Mar 2021 15:16:35 +0800
Subject: [PATCH] Fix the error-level logs displayed for the cloud-init-local service
After cloud-init is installed,restart the host and check the status of the cloud-init-local service.The following error log is displayed:stages.py[ERROR]:Unable to render networking.
The value returned by return (util.system_info() ['variant'] in KNOWN_DISTROS) in the sysconfig.py file is not in the given list of KNOWN_DISTROS.
The actual return value is linux.
Reference:https://bugs.almalinux.org/view.php?id=32&nbn=1
---
cloudinit/net/sysconfig.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
index 0a5d481..17ba3c5 100644
--- a/cloudinit/net/sysconfig.py
+++ b/cloudinit/net/sysconfig.py
@@ -19,7 +19,7 @@ from .network_state import (
LOG = logging.getLogger(__name__)
NM_CFG_FILE = "/etc/NetworkManager/NetworkManager.conf"
-KNOWN_DISTROS = ['centos', 'fedora', 'rhel', 'suse']
+KNOWN_DISTROS = ['centos', 'fedora', 'rhel', 'suse', 'linux']
def _make_header(sep='#'):
--
1.8.3.1

10
cloud-init.spec
View File

@ -1,6 +1,6 @@
Name: cloud-init
Version: 20.3
Release: 1
Release: 2
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
@ -15,6 +15,8 @@ Patch3: bugfix-cloud-init-add-openEuler-os.patch
Patch4: bugfix-sort-requirements.patch
Patch5: add-variable-to-forbid-tmp-dir.patch
Patch9000: Fix-the-error-level-logs-displayed-for-the-cloud-init-local-service.patch
BuildRequires: pkgconfig(systemd) python3-devel python3-setuptools systemd
BuildRequires: iproute python3-configobj python3-httpretty >= 0.8.14-2
BuildRequires: python3-jinja2 python3-jsonpatch python3-jsonschema
@ -120,6 +122,12 @@ fi
%exclude /usr/share/doc/*
%changelog
* Tue May 25 2021 yangzhuangzhuang <yangzhuangzhuang1@huawei.com> - 20.3-2
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:Fix the error level logs displayed for the cloud-init-local service
* Wed Nov 4 2020 yangzhuangzhuang <yangzhuangzhuang1@huawei.com> - 20.3-1
- Type:update
- ID:NA