diff --git a/ci-DS-VMware-modify-a-few-log-level-4284.patch b/ci-DS-VMware-modify-a-few-log-level-4284.patch new file mode 100644 index 0000000..b150d30 --- /dev/null +++ b/ci-DS-VMware-modify-a-few-log-level-4284.patch @@ -0,0 +1,72 @@ +From ca6f3397e1ebdb48f5b85c5cf262356480991430 Mon Sep 17 00:00:00 2001 +From: PengpengSun <40026211+PengpengSun@users.noreply.github.com> +Date: Tue, 25 Jul 2023 05:21:46 +0800 +Subject: [PATCH] DS VMware: modify a few log level (#4284) + +RH-Author: Ani Sinha +RH-MergeRequest: 106: DS VMware: modify a few log level (#4284) +RH-Bugzilla: 2223810 +RH-Acked-by: Emanuele Giuseppe Esposito +RH-Acked-by: Camilla Conte +RH-Commit: [1/1] 1741098157b12b28be03ecdb041fa1f78d7ac042 (anisinha/rhel-cloud-init) + +Multiple ip addresses are common scenario for modern Linux, so set +debug log level for such cases. + +(cherry picked from commit 4a6a9d3f6c8fe213c51f6c1336f1dd378bf4bdca) +Signed-off-by: Ani Sinha +--- + cloudinit/sources/DataSourceVMware.py | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/cloudinit/sources/DataSourceVMware.py b/cloudinit/sources/DataSourceVMware.py +index 07a80222..bc3b5a5f 100644 +--- a/cloudinit/sources/DataSourceVMware.py ++++ b/cloudinit/sources/DataSourceVMware.py +@@ -1,6 +1,6 @@ + # Cloud-Init DataSource for VMware + # +-# Copyright (c) 2018-2022 VMware, Inc. All Rights Reserved. ++# Copyright (c) 2018-2023 VMware, Inc. All Rights Reserved. + # + # Authors: Anish Swaminathan + # Andrew Kutz +@@ -719,7 +719,7 @@ def get_default_ip_addrs(): + af_inet4 = addr4_fams.get(netifaces.AF_INET) + if af_inet4: + if len(af_inet4) > 1: +- LOG.warning( ++ LOG.debug( + "device %s has more than one ipv4 address: %s", + dev4, + af_inet4, +@@ -737,7 +737,7 @@ def get_default_ip_addrs(): + af_inet6 = addr6_fams.get(netifaces.AF_INET6) + if af_inet6: + if len(af_inet6) > 1: +- LOG.warning( ++ LOG.debug( + "device %s has more than one ipv6 address: %s", + dev6, + af_inet6, +@@ -752,7 +752,7 @@ def get_default_ip_addrs(): + af_inet6 = addr4_fams.get(netifaces.AF_INET6) + if af_inet6: + if len(af_inet6) > 1: +- LOG.warning( ++ LOG.debug( + "device %s has more than one ipv6 address: %s", + dev4, + af_inet6, +@@ -767,7 +767,7 @@ def get_default_ip_addrs(): + af_inet4 = addr6_fams.get(netifaces.AF_INET) + if af_inet4: + if len(af_inet4) > 1: +- LOG.warning( ++ LOG.debug( + "device %s has more than one ipv4 address: %s", + dev6, + af_inet4, +-- +2.41.0 + diff --git a/cloud-init.spec b/cloud-init.spec index 2ab05da..007234a 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -6,7 +6,7 @@ Name: cloud-init Version: 23.1.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Cloud instance init scripts Group: System Environment/Base @@ -50,6 +50,8 @@ Patch24: ci-test-fixes-changes-to-apply-RHEL-specific-config-set.patch Patch25: ci-cosmetic-fix-tox-formatting.patch # For bz#2222501 - Don't change log permissions if they are already more restrictive [rhel-8] Patch28: ci-logging-keep-current-file-mode-of-log-file-if-its-st.patch +# For bz#2223810 - [cloud-init] [RHEL8.9]There are warning logs if dev has more than one IPV6 address on ESXi +Patch29: ci-DS-VMware-modify-a-few-log-level-4284.patch BuildArch: noarch @@ -256,6 +258,11 @@ fi %config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf %changelog +* Thu Jul 27 2023 Camilla Conte - 23.1.1-8 +- ci-DS-VMware-modify-a-few-log-level-4284.patch [bz#2223810] +- Resolves: bz#2223810 + ([cloud-init] [RHEL8.9]There are warning logs if dev has more than one IPV6 address on ESXi) + * Tue Jul 25 2023 Miroslav Rezanina - 23.1.1-7 - ci-logging-keep-current-file-mode-of-log-file-if-its-st.patch [bz#2222501] - Resolves: bz#2222501