import WALinuxAgent-2.7.0.6-6.el9
This commit is contained in:
CentOS Sources
Stepan Oksanichenko
parent
4c434cc0dc
commit
44319402ec
@ -0,0 +1,107 @@
|
|||||||
|
From 1671c696f3b0f51e3e317b50aabc5dc84be4ca01 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mohammed Gamal <mgamal@redhat.com>
|
||||||
|
Date: Wed, 3 Aug 2022 13:23:19 +0200
|
||||||
|
Subject: [PATCH 2/2] Update Log Collector default in Comments and Readme
|
||||||
|
(#2608)
|
||||||
|
|
||||||
|
RH-Author: Mohamed Gamal Morsy <mmorsy@redhat.com>
|
||||||
|
RH-MergeRequest: 4: Update Log Collector default in Comments and Readme
|
||||||
|
RH-Commit: [1/1] 2f249d80b7136a0e3dbacb34a75c56454b95b8c2
|
||||||
|
RH-Bugzilla: 2093965
|
||||||
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||||
|
|
||||||
|
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2093965
|
||||||
|
|
||||||
|
(cherry picked from commit a560872bec103523e73ddcb5fb5705896545ffce)
|
||||||
|
|
||||||
|
Signed-off-by: Mohammed Gamal <mgamal@redhat.com>
|
||||||
|
---
|
||||||
|
README.md | 2 +-
|
||||||
|
config/debian/waagent.conf | 2 +-
|
||||||
|
config/suse/waagent.conf | 2 +-
|
||||||
|
config/ubuntu/waagent.conf | 2 +-
|
||||||
|
config/waagent.conf | 2 +-
|
||||||
|
tests/data/test_waagent.conf | 2 +-
|
||||||
|
6 files changed, 6 insertions(+), 6 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/README.md b/README.md
|
||||||
|
index c69f43e6..f2f3db46 100644
|
||||||
|
--- a/README.md
|
||||||
|
+++ b/README.md
|
||||||
|
@@ -465,7 +465,7 @@ _Default: y_
|
||||||
|
|
||||||
|
If set, agent logs will be periodically collected and uploaded to a secure location for improved supportability.
|
||||||
|
|
||||||
|
-NOTE: This feature is only supported ubuntu 16.04+; this flag will not take effect on any other distro.
|
||||||
|
+NOTE: This feature relies on the agent's resource usage features (cgroups); this flag will not take effect on any distro not supported.
|
||||||
|
|
||||||
|
#### __Logs.CollectPeriod__
|
||||||
|
|
||||||
|
diff --git a/config/debian/waagent.conf b/config/debian/waagent.conf
|
||||||
|
index 6bc36604..dfd7afcd 100644
|
||||||
|
--- a/config/debian/waagent.conf
|
||||||
|
+++ b/config/debian/waagent.conf
|
||||||
|
@@ -63,7 +63,7 @@ Logs.Verbose=n
|
||||||
|
# Enable Console logging, default is y
|
||||||
|
# Logs.Console=y
|
||||||
|
|
||||||
|
-# Enable periodic log collection, default is n
|
||||||
|
+# Enable periodic log collection, default is y
|
||||||
|
Logs.Collect=y
|
||||||
|
|
||||||
|
# How frequently to collect logs, default is each hour
|
||||||
|
diff --git a/config/suse/waagent.conf b/config/suse/waagent.conf
|
||||||
|
index ac9f11a2..c617f9af 100644
|
||||||
|
--- a/config/suse/waagent.conf
|
||||||
|
+++ b/config/suse/waagent.conf
|
||||||
|
@@ -66,7 +66,7 @@ Logs.Verbose=n
|
||||||
|
# Enable Console logging, default is y
|
||||||
|
# Logs.Console=y
|
||||||
|
|
||||||
|
-# Enable periodic log collection, default is n
|
||||||
|
+# Enable periodic log collection, default is y
|
||||||
|
Logs.Collect=y
|
||||||
|
|
||||||
|
# How frequently to collect logs, default is each hour
|
||||||
|
diff --git a/config/ubuntu/waagent.conf b/config/ubuntu/waagent.conf
|
||||||
|
index 63635a81..19b56bae 100644
|
||||||
|
--- a/config/ubuntu/waagent.conf
|
||||||
|
+++ b/config/ubuntu/waagent.conf
|
||||||
|
@@ -66,7 +66,7 @@ Logs.Verbose=n
|
||||||
|
# Enable Console logging, default is y
|
||||||
|
# Logs.Console=y
|
||||||
|
|
||||||
|
-# Enable periodic log collection, default is n
|
||||||
|
+# Enable periodic log collection, default is y
|
||||||
|
Logs.Collect=y
|
||||||
|
|
||||||
|
# How frequently to collect logs, default is each hour
|
||||||
|
diff --git a/config/waagent.conf b/config/waagent.conf
|
||||||
|
index c7d10e2f..14cd01c8 100644
|
||||||
|
--- a/config/waagent.conf
|
||||||
|
+++ b/config/waagent.conf
|
||||||
|
@@ -72,7 +72,7 @@ Logs.Verbose=n
|
||||||
|
# Enable Console logging, default is y
|
||||||
|
# Logs.Console=y
|
||||||
|
|
||||||
|
-# Enable periodic log collection, default is n
|
||||||
|
+# Enable periodic log collection, default is y
|
||||||
|
Logs.Collect=y
|
||||||
|
|
||||||
|
# How frequently to collect logs, default is each hour
|
||||||
|
diff --git a/tests/data/test_waagent.conf b/tests/data/test_waagent.conf
|
||||||
|
index a386228a..cc60886e 100644
|
||||||
|
--- a/tests/data/test_waagent.conf
|
||||||
|
+++ b/tests/data/test_waagent.conf
|
||||||
|
@@ -67,7 +67,7 @@ ResourceDisk.MountOptions=None
|
||||||
|
# Enable verbose logging (y|n)
|
||||||
|
Logs.Verbose=n
|
||||||
|
|
||||||
|
-# Enable periodic log collection, default is n
|
||||||
|
+# Enable periodic log collection, default is y
|
||||||
|
Logs.Collect=y
|
||||||
|
|
||||||
|
# How frequently to collect logs, default is each hour
|
||||||
|
--
|
||||||
|
2.31.1
|
||||||
|
|
||||||
@ -0,0 +1,49 @@
|
|||||||
|
From b85814d5683c7f8a1e1b5f3570bcce0a8f76137b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mohammed Gamal <mgamal@redhat.com>
|
||||||
|
Date: Fri, 29 Jul 2022 13:07:13 +0200
|
||||||
|
Subject: [PATCH 1/2] redhat: Use NetworkManager to set DHCP hostnames on
|
||||||
|
recent RHEL distros
|
||||||
|
|
||||||
|
RH-Author: Mohamed Gamal Morsy <mmorsy@redhat.com>
|
||||||
|
RH-MergeRequest: 3: redhat: Use NetworkManager to set DHCP hostnames on recent RHEL distros
|
||||||
|
RH-Commit: [1/1] 2bf51293796ba0e8567e436836adc0547f062b04
|
||||||
|
RH-Bugzilla: 2114830
|
||||||
|
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||||||
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||||
|
|
||||||
|
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2114830
|
||||||
|
|
||||||
|
Recent versions of RHEL 8 and RHEL 9 started using NetworkManager to configure
|
||||||
|
network intefaces instead of sysconfig files. Configurations are no longer
|
||||||
|
stored in /etc/sysconfig/ifcfg-{interface}.
|
||||||
|
|
||||||
|
Fix this for setting DHCP hostnames in those RHEL versions.
|
||||||
|
|
||||||
|
Signed-off-by: Mohammed Gamal <mgamal@redhat.com>
|
||||||
|
---
|
||||||
|
azurelinuxagent/common/osutil/redhat.py | 12 ++++++++++++
|
||||||
|
1 file changed, 12 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/azurelinuxagent/common/osutil/redhat.py b/azurelinuxagent/common/osutil/redhat.py
|
||||||
|
index 5c397ae8..7dd36add 100644
|
||||||
|
--- a/azurelinuxagent/common/osutil/redhat.py
|
||||||
|
+++ b/azurelinuxagent/common/osutil/redhat.py
|
||||||
|
@@ -158,3 +158,15 @@ class RedhatOSUtil(Redhat6xOSUtil):
|
||||||
|
time.sleep(wait)
|
||||||
|
else:
|
||||||
|
logger.warn("exceeded restart retries")
|
||||||
|
+
|
||||||
|
+ def set_dhcp_hostname(self, hostname):
|
||||||
|
+ """
|
||||||
|
+ Recent RHEL distributions use network manager instead of sysconfig files
|
||||||
|
+ to configure network interfaces
|
||||||
|
+ """
|
||||||
|
+ ifname = self.get_if_name()
|
||||||
|
+
|
||||||
|
+ return_code = shellutil.run("nmcli device modify {0} ipv4.dhcp-hostname {1} ipv6.dhcp-hostname {1}".format(ifname, hostname))
|
||||||
|
+
|
||||||
|
+ if return_code != 0:
|
||||||
|
+ logger.error("failed to set DHCP hostname for interface {0}: return code {1}".format(ifname, return_code))
|
||||||
|
--
|
||||||
|
2.31.1
|
||||||
|
|
||||||
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
Name: WALinuxAgent
|
Name: WALinuxAgent
|
||||||
Version: 2.7.0.6
|
Version: 2.7.0.6
|
||||||
Release: 1%{?dist}
|
Release: 6%{?dist}
|
||||||
Summary: The Microsoft Azure Linux Agent
|
Summary: The Microsoft Azure Linux Agent
|
||||||
|
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
@ -14,7 +14,12 @@ Source1: module-setup.sh
|
|||||||
# Python3.9 fixes
|
# Python3.9 fixes
|
||||||
Patch0001: 0001-Initial-redhat-build-configuation.patch
|
Patch0001: 0001-Initial-redhat-build-configuation.patch
|
||||||
Patch0002: 0002-Implement-restart_if-for-RedHat-OS.patch
|
Patch0002: 0002-Implement-restart_if-for-RedHat-OS.patch
|
||||||
|
# For bz#2098233 - [Azure][WALA][RHEL-9] [9.1] walinuxagent kills network during boot
|
||||||
Patch3: wla-redhat-Fix-command-sequence-for-restarting-net-inter.patch
|
Patch3: wla-redhat-Fix-command-sequence-for-restarting-net-inter.patch
|
||||||
|
# For bz#2114830 - [Azure][WALA][RHEL-9.1] Provisioning failed if no ifcfg-eth0
|
||||||
|
Patch4: wla-redhat-Use-NetworkManager-to-set-DHCP-hostnames-on-r.patch
|
||||||
|
# For bz#2093965 - [Azure][WALA][RHEL-9] The description of "Logs.Collect" is incorrect
|
||||||
|
Patch5: wla-Update-Log-Collector-default-in-Comments-and-Readme-.patch
|
||||||
|
|
||||||
# Source-git patches
|
# Source-git patches
|
||||||
|
|
||||||
@ -100,10 +105,12 @@ install -m0755 -D -t %{buildroot}%{_prefix}/lib/dracut/modules.d/%{dracut_modnam
|
|||||||
|
|
||||||
%postun
|
%postun
|
||||||
%systemd_postun_with_restart waagent.service
|
%systemd_postun_with_restart waagent.service
|
||||||
|
rm -rf %{_unitdir}/waagent.service.d/
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%doc LICENSE.txt NOTICE README.md
|
%doc LICENSE.txt NOTICE README.md
|
||||||
%ghost %{_localstatedir}/log/waagent.log
|
%ghost %{_localstatedir}/log/waagent.log
|
||||||
|
%ghost %{_unitdir}/waagent-network-setup.service
|
||||||
%dir %attr(0700, root, root) %{_sharedstatedir}/waagent
|
%dir %attr(0700, root, root) %{_sharedstatedir}/waagent
|
||||||
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
|
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
|
||||||
%{_sbindir}/waagent
|
%{_sbindir}/waagent
|
||||||
@ -124,10 +131,41 @@ install -m0755 -D -t %{buildroot}%{_prefix}/lib/dracut/modules.d/%{dracut_modnam
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed May 25 2022 Miroslav Rezanina <mrezanin@redhat.com> - 2.7.0.6-1.el9_0
|
* Mon Aug 29 2022 Miroslav Rezanina <mrezanin@redhat.com> - 2.7.0.6-6
|
||||||
- Rebase to 2.7.0.6-1 [bz#2110415]
|
- wla-redhat-Remove-files-inside-WALA-services-directory.patch [bz#2114768]
|
||||||
- Resolves: bz#2110415
|
- Resolves: bz#2114768
|
||||||
([Azure][WALA][RHEL-9] [9.0.z]The latest RHEL 9 repositories contain a buggy old version of WALinuxAgent : 2.3.0.2, latest version is v2.7.0.6 [rhel-9.0.0.z])
|
([Azure][WALA][RHEL-9] When remove package some files left)
|
||||||
|
|
||||||
|
* Tue Aug 23 2022 Miroslav Rezanina <mrezanin@redhat.com> - 2.7.0.6-5
|
||||||
|
- wla-redhat-Mark-directories-properly-in-the-files-list.patch [bz#2114768]
|
||||||
|
- Resolves: bz#2114768
|
||||||
|
([Azure][WALA][RHEL-9] When remove package some files left)
|
||||||
|
|
||||||
|
* Wed Aug 17 2022 Miroslav Rezanina <mrezanin@redhat.com> - 2.7.0.6-4
|
||||||
|
- wla-redhat-Remove-all-waagent-unit-files-when-uninstalli.patch [bz#2114768]
|
||||||
|
- Resolves: bz#2114768
|
||||||
|
([Azure][WALA][RHEL-9] When remove package some files left)
|
||||||
|
|
||||||
|
* Mon Aug 08 2022 Miroslav Rezanina <mrezanin@redhat.com> - 2.7.0.6-3
|
||||||
|
- wla-redhat-Use-NetworkManager-to-set-DHCP-hostnames-on-r.patch [bz#2114830]
|
||||||
|
- wla-Update-Log-Collector-default-in-Comments-and-Readme-.patch [bz#2093965]
|
||||||
|
- Resolves: bz#2114830
|
||||||
|
([Azure][WALA][RHEL-9.1] Provisioning failed if no ifcfg-eth0)
|
||||||
|
- Resolves: bz#2093965
|
||||||
|
([Azure][WALA][RHEL-9] The description of "Logs.Collect" is incorrect)
|
||||||
|
|
||||||
|
* Fri Jul 15 2022 Miroslav Rezanina <mrezanin@redhat.com> - 2.7.0.6-2
|
||||||
|
- wla-redhat-Fix-command-sequence-for-restarting-net-inter.patch [bz#2098233]
|
||||||
|
- Resolves: bz#2098233
|
||||||
|
([Azure][WALA][RHEL-9] [9.1] walinuxagent kills network during boot)
|
||||||
|
|
||||||
|
* Wed May 25 2022 Miroslav Rezanina <mrezanin@redhat.com> - 2.7.0.6-1
|
||||||
|
- Rebase to 2.7.0.6-1 [bz#2083464]
|
||||||
|
- Adding restart_if implementation for RHEL [bz#2081944]
|
||||||
|
- Resolves: bz#2083464
|
||||||
|
([Azure][RHEL-9]Rebase WALinuxAgent to v2.7.0.6)
|
||||||
|
- Resolves: bz#2081944
|
||||||
|
([Azure][WALA][9.0] WALA provisions VM failed because of no "ifdown")
|
||||||
|
|
||||||
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.3.0.2-3
|
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.3.0.2-3
|
||||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user