import cloud-init-21.1-7.el8_5.4

SOURCES/ci-Change-netifaces-dependency-to-0.10.4-965.patch

@@ -0,0 +1,47 @@
+From 67d62f2c0df1fcb5cd86be73cba6064075aa61e3 Mon Sep 17 00:00:00 2001
+From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+Date: Fri, 14 Jan 2022 16:39:46 +0100
+Subject: [PATCH 3/6] Change netifaces dependency to 0.10.4 (#965)
+
+RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-MergeRequest: 43: Datasource for VMware
+RH-Commit: [3/6] 81f0638e62841bab09b423d9cb5d340026ee87c2
+RH-Bugzilla: 2040704
+RH-Acked-by: Mohamed Gamal Morsy <mmorsy@redhat.com>
+RH-Acked-by: Eduardo Otubo <otubo@redhat.com>
+
+commit b9d308b4d61d22bacc05bcae59819755975631f8
+Author: Andrew Kutz <101085+akutz@users.noreply.github.com>
+Date:   Tue Aug 10 15:10:44 2021 -0500
+
+    Change netifaces dependency to 0.10.4 (#965)
+
+    Change netifaces dependency to 0.10.4
+
+    Currently versions Ubuntu <=20.10 use netifaces 0.10.4 By requiring
+    netifaces 0.10.9, the VMware datasource omitted itself from cloud-init
+    on Ubuntu <=20.10.
+
+    This patch changes the netifaces dependency to 0.10.4. While it is true
+    there are patches to netifaces post 0.10.4 that are desirable, testing
+    against the most common network configuration was performed to verify
+    the VMware datasource will still function with netifaces 0.10.4.
+
+Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+---
+ requirements.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/requirements.txt b/requirements.txt
+index 41d01d62..c4adc455 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -40,4 +40,4 @@ jsonschema
+ # and still participate in instance-data by gathering the network in detail at
+ # runtime and merge that information into the metadata and repersist that to
+ # disk.
+-netifaces>=0.10.9
++netifaces>=0.10.4
+-- 
+2.27.0
+

SOURCES/ci-Revert-unnecesary-lcase-in-ds-identify-978.patch

@@ -0,0 +1,47 @@
+From 532a36edf0dea2b98835bd08e285bec9c50eb0f9 Mon Sep 17 00:00:00 2001
+From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+Date: Fri, 14 Jan 2022 16:42:41 +0100
+Subject: [PATCH 5/6] Revert unnecesary lcase in ds-identify (#978)
+
+RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-MergeRequest: 43: Datasource for VMware
+RH-Commit: [5/6] 95634e4b42e3abfb91182b090c312eef29c63e54
+RH-Bugzilla: 2040704
+RH-Acked-by: Mohamed Gamal Morsy <mmorsy@redhat.com>
+RH-Acked-by: Eduardo Otubo <otubo@redhat.com>
+
+commit f516a7d37c1654addc02485e681b4358d7e7c0db
+Author: Andrew Kutz <101085+akutz@users.noreply.github.com>
+Date:   Fri Aug 13 14:30:55 2021 -0500
+
+    Revert unnecesary lcase in ds-identify (#978)
+
+    This patch reverts an unnecessary lcase optimization in the
+    ds-identify script. SystemD documents the values produced by
+    the systemd-detect-virt command are lower case, and the mapping
+    table used by the FreeBSD check is also lower-case.
+
+    The optimization added two new forked processes, needlessly
+    causing overhead.
+
+Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+---
+ tools/ds-identify | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/ds-identify b/tools/ds-identify
+index 0e12298f..7b782462 100755
+--- a/tools/ds-identify
++++ b/tools/ds-identify
+@@ -449,7 +449,7 @@ detect_virt() {
+ read_virt() {
+     cached "$DI_VIRT" && return 0
+     detect_virt
+-    DI_VIRT="$(echo "${_RET}" | tr '[:upper:]' '[:lower:]')"
++    DI_VIRT="${_RET}"
+ }
+ 
+ is_container() {
+-- 
+2.27.0
+

SOURCES/ci-Update-dscheck_VMware-s-rpctool-check-970.patch

@@ -0,0 +1,97 @@
+From cc79cb3958b943b755a9b11b3e87ce820058ccaa Mon Sep 17 00:00:00 2001
+From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+Date: Fri, 14 Jan 2022 16:41:47 +0100
+Subject: [PATCH 4/6] Update dscheck_VMware's rpctool check (#970)
+
+RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-MergeRequest: 43: Datasource for VMware
+RH-Commit: [4/6] 6f4d732c55c521869210d8aeedfa1150ea5a92f8
+RH-Bugzilla: 2040704
+RH-Acked-by: Mohamed Gamal Morsy <mmorsy@redhat.com>
+RH-Acked-by: Eduardo Otubo <otubo@redhat.com>
+
+commit 7781dec3306e9467f216cfcb36b7e10a8b38547a
+Author: Shreenidhi Shedi <53473811+sshedi@users.noreply.github.com>
+Date:   Fri Aug 13 00:40:39 2021 +0530
+
+    Update dscheck_VMware's rpctool check (#970)
+
+    This patch updates the dscheck_VMware function's use of "vmware-rpctool".
+
+    When checking to see if a "guestinfo" property is set.
+    Because a successful exit code can occur even if there is an empty
+    string returned, it is possible that the VMware datasource will be
+    loaded as a false-positive. This patch ensures that in addition to
+    validating the exit code, the emitted output is also examined to ensure
+    a non-empty value is returned by rpctool before returning "${DS_FOUND}"
+    from "dscheck_VMware()".
+
+Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+---
+ tools/ds-identify | 15 +++++++++------
+ 1 file changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/tools/ds-identify b/tools/ds-identify
+index c01eae3d..0e12298f 100755
+--- a/tools/ds-identify
++++ b/tools/ds-identify
+@@ -141,6 +141,7 @@ error() {
+     debug 0 "$@"
+     stderr "$@"
+ }
++
+ warn() {
+     set -- "WARN:" "$@"
+     debug 0 "$@"
+@@ -344,7 +345,6 @@ geom_label_status_as() {
+     return $ret
+ }
+ 
+-
+ read_fs_info_freebsd() {
+     local oifs="$IFS" line="" delim=","
+     local ret=0 labels="" dev="" label="" ftype="" isodevs=""
+@@ -404,7 +404,6 @@ cached() {
+     [ -n "$1" ] && _RET="$1" && return || return 1
+ }
+ 
+-
+ detect_virt() {
+     local virt="${UNAVAILABLE}" r="" out=""
+     if [ -d /run/systemd ]; then
+@@ -450,7 +449,7 @@ detect_virt() {
+ read_virt() {
+     cached "$DI_VIRT" && return 0
+     detect_virt
+-    DI_VIRT=${_RET}
++    DI_VIRT="$(echo "${_RET}" | tr '[:upper:]' '[:lower:]')"
+ }
+ 
+ is_container() {
+@@ -1370,16 +1369,20 @@ vmware_has_rpctool() {
+     command -v vmware-rpctool >/dev/null 2>&1
+ }
+ 
++vmware_rpctool_guestinfo() {
++    vmware-rpctool "info-get guestinfo.${1}" 2>/dev/null | grep "[[:alnum:]]"
++}
++
+ vmware_rpctool_guestinfo_metadata() {
+-    vmware-rpctool "info-get guestinfo.metadata"
++    vmware_rpctool_guestinfo "metadata"
+ }
+ 
+ vmware_rpctool_guestinfo_userdata() {
+-    vmware-rpctool "info-get guestinfo.userdata"
++    vmware_rpctool_guestinfo "userdata"
+ }
+ 
+ vmware_rpctool_guestinfo_vendordata() {
+-    vmware-rpctool "info-get guestinfo.vendordata"
++    vmware_rpctool_guestinfo "vendordata"
+ }
+ 
+ dscheck_VMware() {
+-- 
+2.27.0
+

SPECS/cloud-init.spec

@@ -6,7 +6,7 @@
 
 Name:           cloud-init
 Version:        21.1
-Release:        7%{?dist}.3
+Release:        7%{?dist}.4
 Summary:        Cloud instance init scripts
 
 Group:          System Environment/Base
@@ -40,6 +40,18 @@ Patch15: ci-cc_ssh.py-fix-private-key-group-owner-and-permission.patch
 Patch16: ci-fix-error-on-upgrade-caused-by-new-vendordata2-attri.patch
 # For bz#2028756 - [RHEL-8] Above 19.2 of cloud-init fails to configure routes when configuring static and default routes to the same destination IP [rhel-8.5.0.z]
 Patch17: ci-cloudinit-net-handle-two-different-routes-for-the-sa.patch
+# For bz#2040690 - [RHEL8] [Azure] cloud-init fails to configure the system [rhel-8.5.0.z]
+#Patch18: ci-Add-gdisk-and-openssl-as-deps-to-fix-UEFI-Azure-init.patch
+# For bz#2040704 - [cloud-init][RHEL8] Support for cloud-init datasource 'cloud-init-vmware-guestinfo' [rhel-8.5.0.z]
+Patch19: ci-Datasource-for-VMware-953.patch
+# For bz#2040704 - [cloud-init][RHEL8] Support for cloud-init datasource 'cloud-init-vmware-guestinfo' [rhel-8.5.0.z]
+Patch20: ci-Change-netifaces-dependency-to-0.10.4-965.patch
+# For bz#2040704 - [cloud-init][RHEL8] Support for cloud-init datasource 'cloud-init-vmware-guestinfo' [rhel-8.5.0.z]
+Patch21: ci-Update-dscheck_VMware-s-rpctool-check-970.patch
+# For bz#2040704 - [cloud-init][RHEL8] Support for cloud-init datasource 'cloud-init-vmware-guestinfo' [rhel-8.5.0.z]
+Patch22: ci-Revert-unnecesary-lcase-in-ds-identify-978.patch
+# For bz#2040704 - [cloud-init][RHEL8] Support for cloud-init datasource 'cloud-init-vmware-guestinfo' [rhel-8.5.0.z]
+#Patch23: ci-Add-netifaces-package-as-a-Requires-in-cloud-init.sp.patch
 
 BuildArch:      noarch
 
@@ -88,6 +100,10 @@ Requires:       shadow-utils
 Requires:       util-linux
 Requires:       xfsprogs
 Requires:       dhcp-client
+# https://bugzilla.redhat.com/show_bug.cgi?id=2040690
+Requires:       gdisk
+Requires:       openssl
+Requires:       python3-netifaces
 
 %{?systemd_requires}
 
@@ -231,6 +247,18 @@ fi
 %config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf
 
 %changelog
+* Wed Jan 19 2022 Jon Maloy <jmaloy@redhat.com> - 21.1-7.el8_5.4
+- ci-Add-gdisk-and-openssl-as-deps-to-fix-UEFI-Azure-init.patch [bz#2040690]
+- ci-Datasource-for-VMware-953.patch [bz#2040704]
+- ci-Change-netifaces-dependency-to-0.10.4-965.patch [bz#2040704]
+- ci-Update-dscheck_VMware-s-rpctool-check-970.patch [bz#2040704]
+- ci-Revert-unnecesary-lcase-in-ds-identify-978.patch [bz#2040704]
+- ci-Add-netifaces-package-as-a-Requires-in-cloud-init.sp.patch [bz#2040704]
+- Resolves: bz#2040690
+  ([RHEL8] [Azure] cloud-init fails to configure the system [rhel-8.5.0.z])
+- Resolves: bz#2040704
+  ([cloud-init][RHEL8] Support for cloud-init datasource 'cloud-init-vmware-guestinfo' [rhel-8.5.0.z])
+
 * Wed Dec 08 2021 Jon Maloy <jmaloy@redhat.com> - 21.1-7.el8_5.3
 - ci-cloudinit-net-handle-two-different-routes-for-the-sa.patch [bz#2028756]
 - Resolves: bz#2028756