From 67590ca1df6699135e8d3ade4daa4e389ce57f98 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Sep 02 2020 18:26:00 +0000
Subject: import cloud-init-19.4-10.el8


---

diff --git a/SOURCES/ci-Changing-notation-of-subp-call.patch b/SOURCES/ci-Changing-notation-of-subp-call.patch
new file mode 100644
index 0000000..68e7819
--- /dev/null
+++ b/SOURCES/ci-Changing-notation-of-subp-call.patch
@@ -0,0 +1,47 @@
+From d210f4b6c23d2739f76f9ab348090bcf350c5177 Mon Sep 17 00:00:00 2001
+From: Eduardo Otubo <otubo@redhat.com>
+Date: Mon, 31 Aug 2020 09:44:05 +0200
+Subject: [PATCH] Changing notation of subp call
+
+RH-Author: Eduardo Otubo <otubo@redhat.com>
+Message-id: <20200824142252.16298-1-otubo@redhat.com>
+Patchwork-id: 98215
+O-Subject: [RHEL-7.9.z/RHEL-8.2.1/RHEL-8.3.0 cloud-init PATCH] Changing notation of subp call
+Bugzilla: 1839662
+RH-Acked-by: Cathy Avery <cavery@redhat.com>
+RH-Acked-by: Mohammed Gamal <mgamal@redhat.com>
+
+The previous patch was applied upstream on top of a refactoring that moves subp
+to its own module (3c551f6e, Move subp into its own module. (#416), release
+20.2).
+
+Downstream we're not there yet, in order to avoid applying the above
+commit and add a huge refactoring, I'll just change this call and we can
+benefit of this changes in a future rebase.
+
+x-downstream-only: yes
+
+Signed-off-by: Eduardo Otubo <otubo@redhat.com>
+Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
+---
+ cloudinit/sources/helpers/vmware/imc/guestcust_util.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cloudinit/sources/helpers/vmware/imc/guestcust_util.py b/cloudinit/sources/helpers/vmware/imc/guestcust_util.py
+index a270d9f..816f52e 100644
+--- a/cloudinit/sources/helpers/vmware/imc/guestcust_util.py
++++ b/cloudinit/sources/helpers/vmware/imc/guestcust_util.py
+@@ -136,8 +136,8 @@ def get_tools_config(section, key, defaultVal):
+     cmd = ['vmware-toolbox-cmd', 'config', 'get', section, key]
+ 
+     try:
+-        (outText, _) = subp.subp(cmd)
+-    except subp.ProcessExecutionError as e:
++        (outText, _) = util.subp(cmd)
++    except util.ProcessExecutionError as e:
+         if e.exit_code == 69:
+             logger.debug(
+                 "vmware-toolbox-cmd returned 69 (unavailable) for cmd: %s."
+-- 
+1.8.3.1
+
diff --git a/SPECS/cloud-init.spec b/SPECS/cloud-init.spec
index 030010e..454891f 100644
--- a/SPECS/cloud-init.spec
+++ b/SPECS/cloud-init.spec
@@ -6,7 +6,7 @@
 
 Name:           cloud-init
 Version:        19.4
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Cloud instance init scripts
 
 Group:          System Environment/Base
@@ -50,6 +50,8 @@ Patch19: ci-Do-not-use-fallocate-in-swap-file-creation-on-xfs.-7.patch
 Patch20: ci-swap-file-size-being-used-before-checked-if-str-315.patch
 # For bz#1794664 - [RHEL8] swapon fails with "swapfile has holes" when created on a xfs filesystem by cloud-init
 Patch21: ci-Detect-kernel-version-before-swap-file-creation-428.patch
+# For bz#1839662 - [ESXi][RHEL8.3][cloud-init]ERROR log in cloud-init.log after clone VM on ESXi platform
+Patch22: ci-Changing-notation-of-subp-call.patch
 
 BuildArch:      noarch
 
@@ -233,6 +235,11 @@ fi
 %config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf
 
 %changelog
+* Mon Aug 31 2020 Miroslav Rezanina <mrezanin@redhat.com> - 19.4-10.el8
+- ci-Changing-notation-of-subp-call.patch [bz#1839662]
+- Resolves: bz#1839662
+  ([ESXi][RHEL8.3][cloud-init]ERROR log in cloud-init.log after clone VM on ESXi platform)
+
 * Mon Aug 24 2020 Miroslav Rezanina <mrezanin@redhat.com> - 19.4-9.el8
 - ci-Do-not-use-fallocate-in-swap-file-creation-on-xfs.-7.patch [bz#1794664]
 - ci-swap-file-size-being-used-before-checked-if-str-315.patch [bz#1794664]