From 06517b44243dbc88c6beadce52032d60b212a9e3 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 03 2020 11:56:58 +0000 Subject: import WALinuxAgent-2.2.46-8.el8 --- diff --git a/SOURCES/wala-Update-Provisioning-options-1853.patch b/SOURCES/wala-Update-Provisioning-options-1853.patch new file mode 100644 index 0000000..4ef78e7 --- /dev/null +++ b/SOURCES/wala-Update-Provisioning-options-1853.patch @@ -0,0 +1,355 @@ +From 51dcc3b2ba972db7b30c75097919b3e4ab396a89 Mon Sep 17 00:00:00 2001 +From: Vitaly Kuznetsov +Date: Tue, 28 Apr 2020 10:00:11 +0200 +Subject: [PATCH] Update 'Provisioning' options (#1853) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +RH-Author: Vitaly Kuznetsov +Message-id: <20200427083047.1269733-1-vkuznets@redhat.com> +Patchwork-id: 96138 +O-Subject: [RHEL-8.2.1 WALinuxAgent PATCH] Update 'Provisioning' options (#1853) +Bugzilla: 1822882 +RH-Acked-by: Philippe Mathieu-Daudé +RH-Acked-by: Cathy Avery +RH-Acked-by: Mohammed Gamal + +commit 92b652e031dd01027113702df7ee93c816bfd1aa +Author: Vitaly Kuznetsov +Date: Tue Apr 21 02:01:03 2020 +0200 + + Update 'Provisioning' options (#1853) + + 'Provisioning.Enabled' and 'Provisioning.UseCloudInit' parameters are + removed since v2.2.45 and replaced with 'Provisioning.Agent'. Update + distro specific configs accordingly. + + Signed-off-by: Vitaly Kuznetsov + + Co-authored-by: Vitaly Kuznetsov + +Signed-off-by: Vitaly Kuznetsov +Signed-off-by: Miroslav Rezanina +--- + config/alpine/waagent.conf | 8 +++----- + config/arch/waagent.conf | 8 +++----- + config/bigip/waagent.conf | 8 +++----- + config/clearlinux/waagent.conf | 8 +++----- + config/coreos/waagent.conf | 8 +++----- + config/debian/waagent.conf | 8 +++----- + config/freebsd/waagent.conf | 8 +++----- + config/gaia/waagent.conf | 8 +++----- + config/iosxe/waagent.conf | 8 +++----- + config/nsbsd/waagent.conf | 8 +++----- + config/openbsd/waagent.conf | 8 +++----- + config/suse/waagent.conf | 8 +++----- + config/ubuntu/waagent.conf | 8 +++----- + config/waagent.conf | 8 +++----- + 14 files changed, 42 insertions(+), 70 deletions(-) + +diff --git a/config/alpine/waagent.conf b/config/alpine/waagent.conf +index ac9466e..2a010cf 100644 +--- a/config/alpine/waagent.conf ++++ b/config/alpine/waagent.conf +@@ -2,15 +2,13 @@ + # Windows Azure Linux Agent Configuration + # + +-# Enable instance creation +-Provisioning.Enabled=y +- + # Enable extension handling. Do not disable this unless you do not need password reset, + # backup, monitoring, or any extension handling whatsoever. + Extensions.Enabled=y + +-# Rely on cloud-init to provision +-Provisioning.UseCloudInit=n ++# Which provisioning agent to use. Supported values are "auto" (default), "waagent", ++# "cloud-init", or "disabled". ++Provisioning.Agent=auto + + # Password authentication for root account will be unavailable. + Provisioning.DeleteRootPassword=y +diff --git a/config/arch/waagent.conf b/config/arch/waagent.conf +index 8d509cf..f999359 100644 +--- a/config/arch/waagent.conf ++++ b/config/arch/waagent.conf +@@ -2,11 +2,9 @@ + # Microsoft Azure Linux Agent Configuration + # + +-# Enable instance creation +-Provisioning.Enabled=y +- +-# Rely on cloud-init to provision +-Provisioning.UseCloudInit=n ++# Which provisioning agent to use. Supported values are "auto" (default), "waagent", ++# "cloud-init", or "disabled". ++Provisioning.Agent=auto + + # Password authentication for root account will be unavailable. + Provisioning.DeleteRootPassword=n +diff --git a/config/bigip/waagent.conf b/config/bigip/waagent.conf +index 7446bcb..49acf9d 100644 +--- a/config/bigip/waagent.conf ++++ b/config/bigip/waagent.conf +@@ -13,15 +13,13 @@ Role.ConfigurationConsumer=None + # Specified program is invoked with XML file argument specifying role topology. + Role.TopologyConsumer=None + +-# Enable instance creation +-Provisioning.Enabled=y +- + # Enable extension handling. Do not disable this unless you do not need password reset, + # backup, monitoring, or any extension handling whatsoever. + Extensions.Enabled=y + +-# Rely on cloud-init to provision +-Provisioning.UseCloudInit=n ++# Which provisioning agent to use. Supported values are "auto" (default), "waagent", ++# "cloud-init", or "disabled". ++Provisioning.Agent=auto + + # Password authentication for root account will be unavailable. + Provisioning.DeleteRootPassword=y +diff --git a/config/clearlinux/waagent.conf b/config/clearlinux/waagent.conf +index 10567cc..0b70d26 100644 +--- a/config/clearlinux/waagent.conf ++++ b/config/clearlinux/waagent.conf +@@ -13,11 +13,9 @@ Role.ConfigurationConsumer=None + # Specified program is invoked with XML file argument specifying role topology. + Role.TopologyConsumer=None + +-# Enable instance creation +-Provisioning.Enabled=y +- +-# Rely on cloud-init to provision +-Provisioning.UseCloudInit=n ++# Which provisioning agent to use. Supported values are "auto" (default), "waagent", ++# "cloud-init", or "disabled". ++Provisioning.Agent=auto + + # Password authentication for root account will be unavailable. + Provisioning.DeleteRootPassword=y +diff --git a/config/coreos/waagent.conf b/config/coreos/waagent.conf +index 8d3312c..0ce7b27 100644 +--- a/config/coreos/waagent.conf ++++ b/config/coreos/waagent.conf +@@ -2,15 +2,13 @@ + # Microsoft Azure Linux Agent Configuration + # + +-# Enable instance creation +-Provisioning.Enabled=y +- + # Enable extension handling. Do not disable this unless you do not need password reset, + # backup, monitoring, or any extension handling whatsoever. + Extensions.Enabled=y + +-# Rely on cloud-init to provision +-Provisioning.UseCloudInit=n ++# Which provisioning agent to use. Supported values are "auto" (default), "waagent", ++# "cloud-init", or "disabled". ++Provisioning.Agent=auto + + # Password authentication for root account will be unavailable. + Provisioning.DeleteRootPassword=n +diff --git a/config/debian/waagent.conf b/config/debian/waagent.conf +index 28e496e..4c1880e 100644 +--- a/config/debian/waagent.conf ++++ b/config/debian/waagent.conf +@@ -2,15 +2,13 @@ + # Microsoft Azure Linux Agent Configuration + # + +-# Enable instance creation +-Provisioning.Enabled=y +- + # Enable extension handling. Do not disable this unless you do not need password reset, + # backup, monitoring, or any extension handling whatsoever. + Extensions.Enabled=y + +-# Rely on cloud-init to provision +-Provisioning.UseCloudInit=n ++# Which provisioning agent to use. Supported values are "auto" (default), "waagent", ++# "cloud-init", or "disabled". ++Provisioning.Agent=auto + + # Password authentication for root account will be unavailable. + Provisioning.DeleteRootPassword=y +diff --git a/config/freebsd/waagent.conf b/config/freebsd/waagent.conf +index 83988ae..1d1710b 100644 +--- a/config/freebsd/waagent.conf ++++ b/config/freebsd/waagent.conf +@@ -2,15 +2,13 @@ + # Microsoft Azure Linux Agent Configuration + # + +-# Enable instance creation +-Provisioning.Enabled=y +- + # Enable extension handling. Do not disable this unless you do not need password reset, + # backup, monitoring, or any extension handling whatsoever. + Extensions.Enabled=y + +-# Rely on cloud-init to provision +-Provisioning.UseCloudInit=n ++# Which provisioning agent to use. Supported values are "auto" (default), "waagent", ++# "cloud-init", or "disabled". ++Provisioning.Agent=auto + + # Password authentication for root account will be unavailable. + Provisioning.DeleteRootPassword=y +diff --git a/config/gaia/waagent.conf b/config/gaia/waagent.conf +index 6992ff2..b1dc764 100644 +--- a/config/gaia/waagent.conf ++++ b/config/gaia/waagent.conf +@@ -2,15 +2,13 @@ + # Microsoft Azure Linux Agent Configuration + # + +-# Enable instance creation +-Provisioning.Enabled=y +- + # Enable extension handling. Do not disable this unless you do not need password reset, + # backup, monitoring, or any extension handling whatsoever. + Extensions.Enabled=y + +-# Rely on cloud-init to provision +-Provisioning.UseCloudInit=n ++# Which provisioning agent to use. Supported values are "auto" (default), "waagent", ++# "cloud-init", or "disabled". ++Provisioning.Agent=auto + + # Password authentication for root account will be unavailable. + Provisioning.DeleteRootPassword=n +diff --git a/config/iosxe/waagent.conf b/config/iosxe/waagent.conf +index 6787d30..533a234 100644 +--- a/config/iosxe/waagent.conf ++++ b/config/iosxe/waagent.conf +@@ -2,11 +2,9 @@ + # Microsoft Azure Linux Agent Configuration + # + +-# Enable instance creation +-Provisioning.Enabled=n +- +-# Rely on cloud-init to provision +-Provisioning.UseCloudInit=n ++# Which provisioning agent to use. Supported values are "auto" (default), "waagent", ++# "cloud-init", or "disabled". ++Provisioning.Agent=auto + + # Password authentication for root account will be unavailable. + Provisioning.DeleteRootPassword=y +diff --git a/config/nsbsd/waagent.conf b/config/nsbsd/waagent.conf +index 178f9a2..b859fd5 100644 +--- a/config/nsbsd/waagent.conf ++++ b/config/nsbsd/waagent.conf +@@ -2,11 +2,9 @@ + # Microsoft Azure Linux Agent Configuration + # + +-# Enable instance creation +-Provisioning.Enabled=y +- +-# Rely on cloud-init to provision +-Provisioning.UseCloudInit=n ++# Which provisioning agent to use. Supported values are "auto" (default), "waagent", ++# "cloud-init", or "disabled". ++Provisioning.Agent=auto + + # Password authentication for root account will be unavailable. + Provisioning.DeleteRootPassword=n +diff --git a/config/openbsd/waagent.conf b/config/openbsd/waagent.conf +index 54f2e11..697f129 100644 +--- a/config/openbsd/waagent.conf ++++ b/config/openbsd/waagent.conf +@@ -2,11 +2,9 @@ + # Microsoft Azure Linux Agent Configuration + # + +-# Enable instance creation +-Provisioning.Enabled=y +- +-# Rely on cloud-init to provision +-Provisioning.UseCloudInit=n ++# Which provisioning agent to use. Supported values are "auto" (default), "waagent", ++# "cloud-init", or "disabled". ++Provisioning.Agent=auto + + # Password authentication for root account will be unavailable. + Provisioning.DeleteRootPassword=y +diff --git a/config/suse/waagent.conf b/config/suse/waagent.conf +index 5e601e6..dc99b12 100644 +--- a/config/suse/waagent.conf ++++ b/config/suse/waagent.conf +@@ -2,15 +2,13 @@ + # Microsoft Azure Linux Agent Configuration + # + +-# Enable instance creation +-Provisioning.Enabled=y +- + # Enable extension handling. Do not disable this unless you do not need password reset, + # backup, monitoring, or any extension handling whatsoever. + Extensions.Enabled=y + +-# Rely on cloud-init to provision +-Provisioning.UseCloudInit=n ++# Which provisioning agent to use. Supported values are "auto" (default), "waagent", ++# "cloud-init", or "disabled". ++Provisioning.Agent=auto + + # Password authentication for root account will be unavailable. + Provisioning.DeleteRootPassword=y +diff --git a/config/ubuntu/waagent.conf b/config/ubuntu/waagent.conf +index 759db70..8c2c512 100644 +--- a/config/ubuntu/waagent.conf ++++ b/config/ubuntu/waagent.conf +@@ -2,15 +2,13 @@ + # Microsoft Azure Linux Agent Configuration + # + +-# Enable instance creation +-Provisioning.Enabled=n +- + # Enable extension handling. Do not disable this unless you do not need password reset, + # backup, monitoring, or any extension handling whatsoever. + Extensions.Enabled=y + +-# Rely on cloud-init to provision +-Provisioning.UseCloudInit=y ++# Which provisioning agent to use. Supported values are "auto" (default), "waagent", ++# "cloud-init", or "disabled". ++Provisioning.Agent=auto + + # Password authentication for root account will be unavailable. + Provisioning.DeleteRootPassword=y +diff --git a/config/waagent.conf b/config/waagent.conf +index 62a9441..b558bb4 100644 +--- a/config/waagent.conf ++++ b/config/waagent.conf +@@ -2,15 +2,13 @@ + # Microsoft Azure Linux Agent Configuration + # + +-# Enable instance creation +-Provisioning.Enabled=y +- + # Enable extension handling. Do not disable this unless you do not need password reset, + # backup, monitoring, or any extension handling whatsoever. + Extensions.Enabled=y + +-# Rely on cloud-init to provision +-Provisioning.UseCloudInit=n ++# Which provisioning agent to use. Supported values are "auto" (default), "waagent", ++# "cloud-init", or "disabled". ++Provisioning.Agent=auto + + # Password authentication for root account will be unavailable. + Provisioning.DeleteRootPassword=y +-- +1.8.3.1 + diff --git a/SOURCES/wla-Fix-handling-of-gen2-disks-with-udev-rules-1954.patch b/SOURCES/wla-Fix-handling-of-gen2-disks-with-udev-rules-1954.patch new file mode 100644 index 0000000..af18ceb --- /dev/null +++ b/SOURCES/wla-Fix-handling-of-gen2-disks-with-udev-rules-1954.patch @@ -0,0 +1,84 @@ +From f5ae5815bce7a1e10188bdbbb0277d0ae79cafe2 Mon Sep 17 00:00:00 2001 +From: Vitaly Kuznetsov +Date: Thu, 13 Aug 2020 08:43:58 +0200 +Subject: [PATCH] Fix handling of gen2 disks with udev rules (#1954) + +RH-Author: Vitaly Kuznetsov +Message-id: <20200810082500.479999-1-vkuznets@redhat.com> +Patchwork-id: 98129 +O-Subject: [RHEL8.3 WALinuxAgent PATCH] Fix handling of gen2 disks with udev rules (#1954) +Bugzilla: 1859037 +RH-Acked-by: Cathy Avery +RH-Acked-by: Mohammed Gamal + +commit d33f1f810728dbe4e2891149936195d1ec7aaa27 +Author: Thomas Stringer +Date: Mon Jul 20 14:24:22 2020 -0400 + + Fix handling of gen2 disks with udev rules (#1954) + +Signed-off-by: Vitaly Kuznetsov +Signed-off-by: Miroslav Rezanina +--- + config/66-azure-storage.rules | 40 +++++++++++++++++++++++----------------- + 1 file changed, 23 insertions(+), 17 deletions(-) + +diff --git a/config/66-azure-storage.rules b/config/66-azure-storage.rules +index 5fb3693..cf94807 100644 +--- a/config/66-azure-storage.rules ++++ b/config/66-azure-storage.rules +@@ -1,28 +1,34 @@ +-ACTION=="add|change", SUBSYSTEM=="block", ENV{ID_VENDOR}=="Msft", ENV{ID_MODEL}=="Virtual_Disk", GOTO="azure_disk" +-GOTO="azure_end" ++# Azure specific rules. ++ACTION!="add|change", GOTO="walinuxagent_end" ++SUBSYSTEM!="block", GOTO="walinuxagent_end" ++ATTRS{ID_VENDOR}!="Msft", GOTO="walinuxagent_end" ++ATTRS{ID_MODEL}!="Virtual_Disk", GOTO="walinuxagent_end" + +-LABEL="azure_disk" +-# Root has a GUID of 0000 as the second value +-# The resource/resource has GUID of 0001 as the second value +-ATTRS{device_id}=="?00000000-0000-*", ENV{fabric_name}="root", GOTO="azure_names" +-ATTRS{device_id}=="?00000000-0001-*", ENV{fabric_name}="resource", GOTO="azure_names" +-ATTRS{device_id}=="?00000001-0001-*", ENV{fabric_name}="BEK", GOTO="azure_names" +-# Wellknown SCSI controllers ++# Match the known ID parts for root and resource disks. ++ATTRS{device_id}=="?00000000-0000-*", ENV{fabric_name}="root", GOTO="wa_azure_names" ++ATTRS{device_id}=="?00000000-0001-*", ENV{fabric_name}="resource", GOTO="wa_azure_names" ++ ++# Gen2 disk. + ATTRS{device_id}=="{f8b3781a-1e82-4818-a1c3-63d806ec15bb}", ENV{fabric_scsi_controller}="scsi0", GOTO="azure_datadisk" ++# Create symlinks for data disks attached. + ATTRS{device_id}=="{f8b3781b-1e82-4818-a1c3-63d806ec15bb}", ENV{fabric_scsi_controller}="scsi1", GOTO="azure_datadisk" + ATTRS{device_id}=="{f8b3781c-1e82-4818-a1c3-63d806ec15bb}", ENV{fabric_scsi_controller}="scsi2", GOTO="azure_datadisk" + ATTRS{device_id}=="{f8b3781d-1e82-4818-a1c3-63d806ec15bb}", ENV{fabric_scsi_controller}="scsi3", GOTO="azure_datadisk" +-GOTO="azure_end" ++GOTO="walinuxagent_end" + +-# Retrieve LUN number for datadisks ++# Parse out the fabric n ame based off of scsi indicators. + LABEL="azure_datadisk" +-ENV{DEVTYPE}=="partition", PROGRAM="/bin/sh -c 'readlink /sys/class/block/%k/../device|cut -d: -f4'", ENV{fabric_name}="$env{fabric_scsi_controller}/lun$result", GOTO="azure_names" +-PROGRAM="/bin/sh -c 'readlink /sys/class/block/%k/device|cut -d: -f4'", ENV{fabric_name}="$env{fabric_scsi_controller}/lun$result", GOTO="azure_names" +-GOTO="azure_end" ++ENV{DEVTYPE}=="partition", PROGRAM="/bin/sh -c 'readlink /sys/class/block/%k/../device|cut -d: -f4'", ENV{fabric_name}="$env{fabric_scsi_controller}/lun$result" ++ENV{DEVTYPE}=="disk", PROGRAM="/bin/sh -c 'readlink /sys/class/block/%k/device|cut -d: -f4'", ENV{fabric_name}="$env{fabric_scsi_controller}/lun$result" ++ ++ENV{fabric_name}=="scsi0/lun0", ENV{fabric_name}="root" ++ENV{fabric_name}=="scsi0/lun1", ENV{fabric_name}="resource" ++# Don't create a symlink for the cd-rom. ++ENV{fabric_name}=="scsi0/lun2", GOTO="walinuxagent_end" + +-# Create the symlinks +-LABEL="azure_names" ++# Create the symlinks. ++LABEL="wa_azure_names" + ENV{DEVTYPE}=="disk", SYMLINK+="disk/azure/$env{fabric_name}" + ENV{DEVTYPE}=="partition", SYMLINK+="disk/azure/$env{fabric_name}-part%n" + +-LABEL="azure_end" ++LABEL="walinuxagent_end" +-- +1.8.3.1 + diff --git a/SOURCES/wla-Update-Provisioning-options-1853.patch b/SOURCES/wla-Update-Provisioning-options-1853.patch deleted file mode 100644 index bb45be5..0000000 --- a/SOURCES/wla-Update-Provisioning-options-1853.patch +++ /dev/null @@ -1,359 +0,0 @@ -From 5d52fdad0da7ff6146d3153d4529b4b35fe5dc06 Mon Sep 17 00:00:00 2001 -From: Vitaly Kuznetsov -Date: Tue, 28 Apr 2020 10:00:11 +0200 -Subject: [PATCH] Update 'Provisioning' options (#1853) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -RH-Author: Vitaly Kuznetsov -Message-id: <20200427083047.1269733-1-vkuznets@redhat.com> -Patchwork-id: 96138 -O-Subject: [RHEL-8.2.1 WALinuxAgent PATCH] Update 'Provisioning' options (#1853) -Bugzilla: 1827792 -RH-Acked-by: Philippe Mathieu-Daudé -RH-Acked-by: Cathy Avery -RH-Acked-by: Mohammed Gamal - -Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1827792 -Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=28200849 -Branch: rhel821/master-2.2.46 - -commit 92b652e031dd01027113702df7ee93c816bfd1aa -Author: Vitaly Kuznetsov -Date: Tue Apr 21 02:01:03 2020 +0200 - - Update 'Provisioning' options (#1853) - - 'Provisioning.Enabled' and 'Provisioning.UseCloudInit' parameters are - removed since v2.2.45 and replaced with 'Provisioning.Agent'. Update - distro specific configs accordingly. - - Signed-off-by: Vitaly Kuznetsov - - Co-authored-by: Vitaly Kuznetsov - -Signed-off-by: Vitaly Kuznetsov -Signed-off-by: Miroslav Rezanina ---- - config/alpine/waagent.conf | 8 +++----- - config/arch/waagent.conf | 8 +++----- - config/bigip/waagent.conf | 8 +++----- - config/clearlinux/waagent.conf | 8 +++----- - config/coreos/waagent.conf | 8 +++----- - config/debian/waagent.conf | 8 +++----- - config/freebsd/waagent.conf | 8 +++----- - config/gaia/waagent.conf | 8 +++----- - config/iosxe/waagent.conf | 8 +++----- - config/nsbsd/waagent.conf | 8 +++----- - config/openbsd/waagent.conf | 8 +++----- - config/suse/waagent.conf | 8 +++----- - config/ubuntu/waagent.conf | 8 +++----- - config/waagent.conf | 8 +++----- - 14 files changed, 42 insertions(+), 70 deletions(-) - -diff --git a/config/alpine/waagent.conf b/config/alpine/waagent.conf -index ac9466e..2a010cf 100644 ---- a/config/alpine/waagent.conf -+++ b/config/alpine/waagent.conf -@@ -2,15 +2,13 @@ - # Windows Azure Linux Agent Configuration - # - --# Enable instance creation --Provisioning.Enabled=y -- - # Enable extension handling. Do not disable this unless you do not need password reset, - # backup, monitoring, or any extension handling whatsoever. - Extensions.Enabled=y - --# Rely on cloud-init to provision --Provisioning.UseCloudInit=n -+# Which provisioning agent to use. Supported values are "auto" (default), "waagent", -+# "cloud-init", or "disabled". -+Provisioning.Agent=auto - - # Password authentication for root account will be unavailable. - Provisioning.DeleteRootPassword=y -diff --git a/config/arch/waagent.conf b/config/arch/waagent.conf -index 8d509cf..f999359 100644 ---- a/config/arch/waagent.conf -+++ b/config/arch/waagent.conf -@@ -2,11 +2,9 @@ - # Microsoft Azure Linux Agent Configuration - # - --# Enable instance creation --Provisioning.Enabled=y -- --# Rely on cloud-init to provision --Provisioning.UseCloudInit=n -+# Which provisioning agent to use. Supported values are "auto" (default), "waagent", -+# "cloud-init", or "disabled". -+Provisioning.Agent=auto - - # Password authentication for root account will be unavailable. - Provisioning.DeleteRootPassword=n -diff --git a/config/bigip/waagent.conf b/config/bigip/waagent.conf -index 7446bcb..49acf9d 100644 ---- a/config/bigip/waagent.conf -+++ b/config/bigip/waagent.conf -@@ -13,15 +13,13 @@ Role.ConfigurationConsumer=None - # Specified program is invoked with XML file argument specifying role topology. - Role.TopologyConsumer=None - --# Enable instance creation --Provisioning.Enabled=y -- - # Enable extension handling. Do not disable this unless you do not need password reset, - # backup, monitoring, or any extension handling whatsoever. - Extensions.Enabled=y - --# Rely on cloud-init to provision --Provisioning.UseCloudInit=n -+# Which provisioning agent to use. Supported values are "auto" (default), "waagent", -+# "cloud-init", or "disabled". -+Provisioning.Agent=auto - - # Password authentication for root account will be unavailable. - Provisioning.DeleteRootPassword=y -diff --git a/config/clearlinux/waagent.conf b/config/clearlinux/waagent.conf -index 10567cc..0b70d26 100644 ---- a/config/clearlinux/waagent.conf -+++ b/config/clearlinux/waagent.conf -@@ -13,11 +13,9 @@ Role.ConfigurationConsumer=None - # Specified program is invoked with XML file argument specifying role topology. - Role.TopologyConsumer=None - --# Enable instance creation --Provisioning.Enabled=y -- --# Rely on cloud-init to provision --Provisioning.UseCloudInit=n -+# Which provisioning agent to use. Supported values are "auto" (default), "waagent", -+# "cloud-init", or "disabled". -+Provisioning.Agent=auto - - # Password authentication for root account will be unavailable. - Provisioning.DeleteRootPassword=y -diff --git a/config/coreos/waagent.conf b/config/coreos/waagent.conf -index 8d3312c..0ce7b27 100644 ---- a/config/coreos/waagent.conf -+++ b/config/coreos/waagent.conf -@@ -2,15 +2,13 @@ - # Microsoft Azure Linux Agent Configuration - # - --# Enable instance creation --Provisioning.Enabled=y -- - # Enable extension handling. Do not disable this unless you do not need password reset, - # backup, monitoring, or any extension handling whatsoever. - Extensions.Enabled=y - --# Rely on cloud-init to provision --Provisioning.UseCloudInit=n -+# Which provisioning agent to use. Supported values are "auto" (default), "waagent", -+# "cloud-init", or "disabled". -+Provisioning.Agent=auto - - # Password authentication for root account will be unavailable. - Provisioning.DeleteRootPassword=n -diff --git a/config/debian/waagent.conf b/config/debian/waagent.conf -index 28e496e..4c1880e 100644 ---- a/config/debian/waagent.conf -+++ b/config/debian/waagent.conf -@@ -2,15 +2,13 @@ - # Microsoft Azure Linux Agent Configuration - # - --# Enable instance creation --Provisioning.Enabled=y -- - # Enable extension handling. Do not disable this unless you do not need password reset, - # backup, monitoring, or any extension handling whatsoever. - Extensions.Enabled=y - --# Rely on cloud-init to provision --Provisioning.UseCloudInit=n -+# Which provisioning agent to use. Supported values are "auto" (default), "waagent", -+# "cloud-init", or "disabled". -+Provisioning.Agent=auto - - # Password authentication for root account will be unavailable. - Provisioning.DeleteRootPassword=y -diff --git a/config/freebsd/waagent.conf b/config/freebsd/waagent.conf -index 83988ae..1d1710b 100644 ---- a/config/freebsd/waagent.conf -+++ b/config/freebsd/waagent.conf -@@ -2,15 +2,13 @@ - # Microsoft Azure Linux Agent Configuration - # - --# Enable instance creation --Provisioning.Enabled=y -- - # Enable extension handling. Do not disable this unless you do not need password reset, - # backup, monitoring, or any extension handling whatsoever. - Extensions.Enabled=y - --# Rely on cloud-init to provision --Provisioning.UseCloudInit=n -+# Which provisioning agent to use. Supported values are "auto" (default), "waagent", -+# "cloud-init", or "disabled". -+Provisioning.Agent=auto - - # Password authentication for root account will be unavailable. - Provisioning.DeleteRootPassword=y -diff --git a/config/gaia/waagent.conf b/config/gaia/waagent.conf -index 6992ff2..b1dc764 100644 ---- a/config/gaia/waagent.conf -+++ b/config/gaia/waagent.conf -@@ -2,15 +2,13 @@ - # Microsoft Azure Linux Agent Configuration - # - --# Enable instance creation --Provisioning.Enabled=y -- - # Enable extension handling. Do not disable this unless you do not need password reset, - # backup, monitoring, or any extension handling whatsoever. - Extensions.Enabled=y - --# Rely on cloud-init to provision --Provisioning.UseCloudInit=n -+# Which provisioning agent to use. Supported values are "auto" (default), "waagent", -+# "cloud-init", or "disabled". -+Provisioning.Agent=auto - - # Password authentication for root account will be unavailable. - Provisioning.DeleteRootPassword=n -diff --git a/config/iosxe/waagent.conf b/config/iosxe/waagent.conf -index 6787d30..533a234 100644 ---- a/config/iosxe/waagent.conf -+++ b/config/iosxe/waagent.conf -@@ -2,11 +2,9 @@ - # Microsoft Azure Linux Agent Configuration - # - --# Enable instance creation --Provisioning.Enabled=n -- --# Rely on cloud-init to provision --Provisioning.UseCloudInit=n -+# Which provisioning agent to use. Supported values are "auto" (default), "waagent", -+# "cloud-init", or "disabled". -+Provisioning.Agent=auto - - # Password authentication for root account will be unavailable. - Provisioning.DeleteRootPassword=y -diff --git a/config/nsbsd/waagent.conf b/config/nsbsd/waagent.conf -index 178f9a2..b859fd5 100644 ---- a/config/nsbsd/waagent.conf -+++ b/config/nsbsd/waagent.conf -@@ -2,11 +2,9 @@ - # Microsoft Azure Linux Agent Configuration - # - --# Enable instance creation --Provisioning.Enabled=y -- --# Rely on cloud-init to provision --Provisioning.UseCloudInit=n -+# Which provisioning agent to use. Supported values are "auto" (default), "waagent", -+# "cloud-init", or "disabled". -+Provisioning.Agent=auto - - # Password authentication for root account will be unavailable. - Provisioning.DeleteRootPassword=n -diff --git a/config/openbsd/waagent.conf b/config/openbsd/waagent.conf -index 54f2e11..697f129 100644 ---- a/config/openbsd/waagent.conf -+++ b/config/openbsd/waagent.conf -@@ -2,11 +2,9 @@ - # Microsoft Azure Linux Agent Configuration - # - --# Enable instance creation --Provisioning.Enabled=y -- --# Rely on cloud-init to provision --Provisioning.UseCloudInit=n -+# Which provisioning agent to use. Supported values are "auto" (default), "waagent", -+# "cloud-init", or "disabled". -+Provisioning.Agent=auto - - # Password authentication for root account will be unavailable. - Provisioning.DeleteRootPassword=y -diff --git a/config/suse/waagent.conf b/config/suse/waagent.conf -index 5e601e6..dc99b12 100644 ---- a/config/suse/waagent.conf -+++ b/config/suse/waagent.conf -@@ -2,15 +2,13 @@ - # Microsoft Azure Linux Agent Configuration - # - --# Enable instance creation --Provisioning.Enabled=y -- - # Enable extension handling. Do not disable this unless you do not need password reset, - # backup, monitoring, or any extension handling whatsoever. - Extensions.Enabled=y - --# Rely on cloud-init to provision --Provisioning.UseCloudInit=n -+# Which provisioning agent to use. Supported values are "auto" (default), "waagent", -+# "cloud-init", or "disabled". -+Provisioning.Agent=auto - - # Password authentication for root account will be unavailable. - Provisioning.DeleteRootPassword=y -diff --git a/config/ubuntu/waagent.conf b/config/ubuntu/waagent.conf -index 759db70..8c2c512 100644 ---- a/config/ubuntu/waagent.conf -+++ b/config/ubuntu/waagent.conf -@@ -2,15 +2,13 @@ - # Microsoft Azure Linux Agent Configuration - # - --# Enable instance creation --Provisioning.Enabled=n -- - # Enable extension handling. Do not disable this unless you do not need password reset, - # backup, monitoring, or any extension handling whatsoever. - Extensions.Enabled=y - --# Rely on cloud-init to provision --Provisioning.UseCloudInit=y -+# Which provisioning agent to use. Supported values are "auto" (default), "waagent", -+# "cloud-init", or "disabled". -+Provisioning.Agent=auto - - # Password authentication for root account will be unavailable. - Provisioning.DeleteRootPassword=y -diff --git a/config/waagent.conf b/config/waagent.conf -index 62a9441..b558bb4 100644 ---- a/config/waagent.conf -+++ b/config/waagent.conf -@@ -2,15 +2,13 @@ - # Microsoft Azure Linux Agent Configuration - # - --# Enable instance creation --Provisioning.Enabled=y -- - # Enable extension handling. Do not disable this unless you do not need password reset, - # backup, monitoring, or any extension handling whatsoever. - Extensions.Enabled=y - --# Rely on cloud-init to provision --Provisioning.UseCloudInit=n -+# Which provisioning agent to use. Supported values are "auto" (default), "waagent", -+# "cloud-init", or "disabled". -+Provisioning.Agent=auto - - # Password authentication for root account will be unavailable. - Provisioning.DeleteRootPassword=y --- -1.8.3.1 - diff --git a/SPECS/WALinuxAgent.spec b/SPECS/WALinuxAgent.spec index 2c390c8..9215aa4 100644 --- a/SPECS/WALinuxAgent.spec +++ b/SPECS/WALinuxAgent.spec @@ -1,7 +1,7 @@ Summary: Microsoft Azure Linux Agent Name: WALinuxAgent Version: 2.2.46 -Release: 1%{?dist}.5 +Release: 8%{?dist} License: ASL 2.0 Group: Development/Libraries @@ -11,8 +11,10 @@ Source0: WALinuxAgent-2.2.46.tar.gz BuildArch: noarch Patch0001: 0001-Add-inital-redhat-build-support.patch Patch0002: 0003-Fix-fips.patch -# For bz#1827792 - [Azure][RHEL-8.2.1]Some parameter changes are not in waagent.conf -Patch3: wla-Update-Provisioning-options-1853.patch +# For bz#1822882 - [Azure][RHEL-8]Some parameter changes are not in waagent.conf +Patch3: wala-Update-Provisioning-options-1853.patch +# For bz#1859037 - [Azure][WALA]Cannot create /dev/disk/azure/resource softlinks in Gen2 VM +Patch4: wla-Fix-handling-of-gen2-disks-with-udev-rules-1954.patch # rhel requirements BuildRequires: python3-devel @@ -41,6 +43,7 @@ images that are built to run in the Azure environment. %patch0001 -p1 %patch0002 -p1 %patch3 -p1 +%patch4 -p1 %build %py3_build @@ -65,23 +68,33 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{python3_sitelib}/* %config(noreplace) %{_sysconfdir}/waagent.conf -%{_sysconfdir}/logrotate.d/waagent.logrotate +%config(noreplace) %{_sysconfdir}/logrotate.d/waagent.logrotate +%config(noreplace) %{_sysconfdir}/logrotate.d/waagent-extn.logrotate %{_sbindir}/waagent %{_unitdir}/waagent.service /etc/udev/rules.d/66-azure-storage.rules /etc/udev/rules.d/99-azure-product-uuid.rules -/etc/logrotate.d/waagent-extn.logrotate %changelog -* Tue Apr 28 2020 Miroslav Rezanina - 2.2.46-1.el8.5 -- wla-Update-Provisioning-options-1853.patch [bz#1827792] -- Resolves: bz#1827792 - ([Azure][RHEL-8.2.1]Some parameter changes are not in waagent.conf) - -* Wed Apr 15 2020 Miroslav Rezanina - 2.2.46-1.el8.4 -- Rebase to 2.2.46 [bz#1806685] -- Resolves: bz#1806685 - (Rebase WALinuxAgent to 2.2.46 for RHEL 8.2.1) +* Thu Aug 13 2020 Miroslav Rezanina - 2.2.46-8.el8 +- wla-Fix-handling-of-gen2-disks-with-udev-rules-1954.patch [bz#1859037] +- Resolves: bz#1859037 + ([Azure][WALA]Cannot create /dev/disk/azure/resource softlinks in Gen2 VM) + +* Wed Jun 10 2020 Miroslav Rezanina - 2.2.46-7.el8 +- wla-Mark-logrotate-configs-with-config-noreplace.patch [bz#1838254] +- Resolves: bz#1838254 + ([Azure]WALinuxAgent RPM update clobbers waagent.logrotate log rotation changes) + +* Tue May 26 2020 Miroslav Rezanina - 2.2.46-6.el8 +- wala-Update-Provisioning-options-1853.patch [bz#1827792] +- Resolves: bz#1822882 + ([Azure][RHEL-8]Some parameter changes are not in waagent.conf) + +* Wed Apr 15 2020 Miroslav Rezanina - 2.2.46-5.el8 +- Rebase to 2.2.46 [bz#1791069] +- Resolves: bz#1791069 + ([Azure][RHEL-8.3]Ask to increase the WALA version available for RHEL 8.0 to 2.2.46) * Wed Jul 24 2019 Miroslav Rezanina - 2.2.38-1 - Rebase to 2.2.38 [bz#1722848]