diff --git a/SOURCES/ci-Azure-Changes-to-the-Hyper-V-KVP-Reporter.patch b/SOURCES/ci-Azure-Changes-to-the-Hyper-V-KVP-Reporter.patch
index 945df1d..7fe1d64 100644
--- a/SOURCES/ci-Azure-Changes-to-the-Hyper-V-KVP-Reporter.patch
+++ b/SOURCES/ci-Azure-Changes-to-the-Hyper-V-KVP-Reporter.patch
@@ -1,4 +1,4 @@
-From a758c579c707df04734efb4390bd4d45ff398eab Mon Sep 17 00:00:00 2001
+From f919e65e4a462b385a6daa6b7cccc6af1358cbcf Mon Sep 17 00:00:00 2001
From: Eduardo Otubo <otubo@redhat.com>
Date: Wed, 29 May 2019 13:41:47 +0200
Subject: [PATCH 3/5] Azure: Changes to the Hyper-V KVP Reporter
@@ -10,7 +10,7 @@ RH-Author: Eduardo Otubo <otubo@redhat.com>
Message-id: <20190529134149.842-4-otubo@redhat.com>
Patchwork-id: 88266
O-Subject: [RHEL-8.0.1/RHEL-8.1.0 cloud-init PATCHv2 3/5] Azure: Changes to the Hyper-V KVP Reporter
-Bugzilla: 1648375
+Bugzilla: 1691986
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
RH-Acked-by: Cathy Avery <cavery@redhat.com>
diff --git a/SOURCES/ci-Azure-Ensure-platform-random_seed-is-always-serializ.patch b/SOURCES/ci-Azure-Ensure-platform-random_seed-is-always-serializ.patch
index 130ad9a..b77e755 100644
--- a/SOURCES/ci-Azure-Ensure-platform-random_seed-is-always-serializ.patch
+++ b/SOURCES/ci-Azure-Ensure-platform-random_seed-is-always-serializ.patch
@@ -1,4 +1,4 @@
-From 7fb6356ab820b28af7479382c4f63c32e3d653be Mon Sep 17 00:00:00 2001
+From ae9b545cef4a68dfb9f9356dd27e43ff71ec26aa Mon Sep 17 00:00:00 2001
From: Eduardo Otubo <otubo@redhat.com>
Date: Wed, 29 May 2019 13:41:45 +0200
Subject: [PATCH 1/5] Azure: Ensure platform random_seed is always serializable
@@ -8,7 +8,7 @@ RH-Author: Eduardo Otubo <otubo@redhat.com>
Message-id: <20190529134149.842-2-otubo@redhat.com>
Patchwork-id: 88272
O-Subject: [RHEL-8.0.1/RHEL-8.1.0 cloud-init PATCHv2 1/5] Azure: Ensure platform random_seed is always serializable as JSON.
-Bugzilla: 1648375
+Bugzilla: 1691986
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
RH-Acked-by: Cathy Avery <cavery@redhat.com>
diff --git a/SOURCES/ci-Azure-Return-static-fallback-address-as-if-failed-to.patch b/SOURCES/ci-Azure-Return-static-fallback-address-as-if-failed-to.patch
index 917559c..78269a0 100644
--- a/SOURCES/ci-Azure-Return-static-fallback-address-as-if-failed-to.patch
+++ b/SOURCES/ci-Azure-Return-static-fallback-address-as-if-failed-to.patch
@@ -1,14 +1,14 @@
-From f28ece4ddb379b5e223c658200a9747b97a4701c Mon Sep 17 00:00:00 2001
+From ae0f85f867714009af7d4ec6c58e30c552bab556 Mon Sep 17 00:00:00 2001
From: Eduardo Otubo <otubo@redhat.com>
Date: Wed, 3 Jul 2019 13:06:49 +0200
-Subject: [PATCH] Azure: Return static fallback address as if failed to find
- endpoint
+Subject: [PATCH 2/2] Azure: Return static fallback address as if failed to
+ find endpoint
RH-Author: Eduardo Otubo <otubo@redhat.com>
Message-id: <20190703130649.14511-1-otubo@redhat.com>
Patchwork-id: 89353
O-Subject: [RHEL-8.0.1/RHEL-8.1.0 cloud-init PATCH] Azure: Return static fallback address as if failed to find endpoint
-Bugzilla: 1648375
+Bugzilla: 1691986
RH-Acked-by: Bandan Das <bsd@redhat.com>
RH-Acked-by: Mohammed Gamal <mgamal@redhat.com>
diff --git a/SOURCES/ci-DataSourceAzure-Adjust-timeout-for-polling-IMDS.patch b/SOURCES/ci-DataSourceAzure-Adjust-timeout-for-polling-IMDS.patch
index 6a91571..afa3324 100644
--- a/SOURCES/ci-DataSourceAzure-Adjust-timeout-for-polling-IMDS.patch
+++ b/SOURCES/ci-DataSourceAzure-Adjust-timeout-for-polling-IMDS.patch
@@ -1,4 +1,4 @@
-From daed9fe5c87c679fe2576be47fc195d44629b142 Mon Sep 17 00:00:00 2001
+From b2500e258b930479cef36f514fcf9581ba68c976 Mon Sep 17 00:00:00 2001
From: Eduardo Otubo <otubo@redhat.com>
Date: Wed, 29 May 2019 13:41:48 +0200
Subject: [PATCH 4/5] DataSourceAzure: Adjust timeout for polling IMDS
@@ -7,7 +7,7 @@ RH-Author: Eduardo Otubo <otubo@redhat.com>
Message-id: <20190529134149.842-5-otubo@redhat.com>
Patchwork-id: 88267
O-Subject: [RHEL-8.0.1/RHEL-8.1.0 cloud-init PATCHv2 4/5] DataSourceAzure: Adjust timeout for polling IMDS
-Bugzilla: 1648375
+Bugzilla: 1691986
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
RH-Acked-by: Cathy Avery <cavery@redhat.com>
diff --git a/SOURCES/ci-DatasourceAzure-add-additional-logging-for-azure-dat.patch b/SOURCES/ci-DatasourceAzure-add-additional-logging-for-azure-dat.patch
index 1f461db..ea58c58 100644
--- a/SOURCES/ci-DatasourceAzure-add-additional-logging-for-azure-dat.patch
+++ b/SOURCES/ci-DatasourceAzure-add-additional-logging-for-azure-dat.patch
@@ -1,4 +1,4 @@
-From f6054bcebaca3fd731f4547ce0ad4ddf3bbcbd23 Mon Sep 17 00:00:00 2001
+From 4e4e73df5ce7a819f48bed0ae6d2f0b1fb7e243b Mon Sep 17 00:00:00 2001
From: Eduardo Otubo <otubo@redhat.com>
Date: Wed, 29 May 2019 13:41:46 +0200
Subject: [PATCH 2/5] DatasourceAzure: add additional logging for azure
@@ -8,7 +8,7 @@ RH-Author: Eduardo Otubo <otubo@redhat.com>
Message-id: <20190529134149.842-3-otubo@redhat.com>
Patchwork-id: 88268
O-Subject: [RHEL-8.0.1/RHEL-8.1.0 cloud-init PATCHv2 2/5] DatasourceAzure: add additional logging for azure datasource
-Bugzilla: 1648375
+Bugzilla: 1691986
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
RH-Acked-by: Cathy Avery <cavery@redhat.com>
diff --git a/SOURCES/ci-Revert-azure-ensure-that-networkmanager-hook-script-.patch b/SOURCES/ci-Revert-azure-ensure-that-networkmanager-hook-script-.patch
index 601e555..5f1e0ef 100644
--- a/SOURCES/ci-Revert-azure-ensure-that-networkmanager-hook-script-.patch
+++ b/SOURCES/ci-Revert-azure-ensure-that-networkmanager-hook-script-.patch
@@ -1,14 +1,15 @@
-From c49b8b2ec4fcee5212440d996bc3dafa74992470 Mon Sep 17 00:00:00 2001
+From a00bafbfc54b010d7bbe95536929c678288d4c80 Mon Sep 17 00:00:00 2001
From: Eduardo Otubo <otubo@redhat.com>
-Date: Thu, 14 Mar 2019 15:01:34 +0100
-Subject: [PATCH] Revert: azure: ensure that networkmanager hook script runs
+Date: Mon, 1 Jul 2019 11:22:52 +0200
+Subject: [PATCH 1/2] Revert: azure: ensure that networkmanager hook script
+ runs
RH-Author: Eduardo Otubo <otubo@redhat.com>
-Message-id: <20190314150134.28636-1-otubo@redhat.com>
-Patchwork-id: 84868
-O-Subject: [RHEL-8.0.1 cloud-init PATCHv2] Revert: azure: ensure that networkmanager hook script runs
-Bugzilla: 1579237
-RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
+Message-id: <20190701112252.32674-1-otubo@redhat.com>
+Patchwork-id: 89162
+O-Subject: [rhel-8.1.0 cloud-init PATCH] Revert: azure: ensure that networkmanager hook script runs
+Bugzilla: 1692914
+RH-Acked-by: Mohammed Gamal <mgamal@redhat.com>
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
This patch reverts the commit:
@@ -27,8 +28,8 @@ Date: Thu Jun 15 12:20:39 2017 -0400
Resolves: rhbz#1460206
X-downstream-only: true
-Resolves: rhbz:1579237
-X-downstream-only: yes
+Resolves: rhbz#1692914
+X-downstream-only: true
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
diff --git a/SOURCES/ci-cc_mounts-check-if-mount-a-on-no-change-fstab-path.patch b/SOURCES/ci-cc_mounts-check-if-mount-a-on-no-change-fstab-path.patch
index 256331d..d0f1fe7 100644
--- a/SOURCES/ci-cc_mounts-check-if-mount-a-on-no-change-fstab-path.patch
+++ b/SOURCES/ci-cc_mounts-check-if-mount-a-on-no-change-fstab-path.patch
@@ -1,4 +1,4 @@
-From 73e300d896aa04ca4612efc4454c650d92bb10c0 Mon Sep 17 00:00:00 2001
+From 2604984fc44dde89dac847de9f95011713d448ff Mon Sep 17 00:00:00 2001
From: Eduardo Otubo <otubo@redhat.com>
Date: Wed, 29 May 2019 13:41:49 +0200
Subject: [PATCH 5/5] cc_mounts: check if mount -a on no-change fstab path
@@ -7,7 +7,7 @@ RH-Author: Eduardo Otubo <otubo@redhat.com>
Message-id: <20190529134149.842-6-otubo@redhat.com>
Patchwork-id: 88269
O-Subject: [RHEL-8.0.1/RHEL-8.1.0 cloud-init PATCHv2 5/5] cc_mounts: check if mount -a on no-change fstab path
-Bugzilla: 1648375
+Bugzilla: 1691986
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
RH-Acked-by: Cathy Avery <cavery@redhat.com>
diff --git a/SPECS/cloud-init.spec b/SPECS/cloud-init.spec
index c0568f2..3496f6b 100644
--- a/SPECS/cloud-init.spec
+++ b/SPECS/cloud-init.spec
@@ -6,7 +6,7 @@
Name: cloud-init
Version: 18.5
-Release: 1%{?dist}.4
+Release: 7%{?dist}
Summary: Cloud instance init scripts
Group: System Environment/Base
@@ -27,19 +27,19 @@ Patch0009: 0009-net-Wait-for-dhclient-to-daemonize-before-reading-le.patch
Patch0010: 0010-cloud-init-per-don-t-use-dashes-in-sem-names.patch
Patch0011: 0011-azure-Filter-list-of-ssh-keys-pulled-from-fabric.patch
Patch0012: 0012-include-NOZEROCONF-yes-in-etc-sysconfig-network.patch
-# For bz#1579237 - [WALA][cloud] cloud-init dhclient-hook script has some unexpected side-effects on Azure
-Patch13: ci-Revert-azure-ensure-that-networkmanager-hook-script-.patch
-# For bz#1648375 - [Azure] [RHEL 8] Cloud-init fixes to support fast provisioning for Azure
-Patch14: ci-Azure-Ensure-platform-random_seed-is-always-serializ.patch
-# For bz#1648375 - [Azure] [RHEL 8] Cloud-init fixes to support fast provisioning for Azure
-Patch15: ci-DatasourceAzure-add-additional-logging-for-azure-dat.patch
-# For bz#1648375 - [Azure] [RHEL 8] Cloud-init fixes to support fast provisioning for Azure
-Patch16: ci-Azure-Changes-to-the-Hyper-V-KVP-Reporter.patch
-# For bz#1648375 - [Azure] [RHEL 8] Cloud-init fixes to support fast provisioning for Azure
-Patch17: ci-DataSourceAzure-Adjust-timeout-for-polling-IMDS.patch
-# For bz#1648375 - [Azure] [RHEL 8] Cloud-init fixes to support fast provisioning for Azure
-Patch18: ci-cc_mounts-check-if-mount-a-on-no-change-fstab-path.patch
-# For bz#1648375 - [Azure] [RHEL 8] Cloud-init fixes to support fast provisioning for Azure[8.0.1]
+# For bz#1691986 - [Azure] [RHEL 8.1] Cloud-init fixes to support fast provisioning for Azure
+Patch13: ci-Azure-Ensure-platform-random_seed-is-always-serializ.patch
+# For bz#1691986 - [Azure] [RHEL 8.1] Cloud-init fixes to support fast provisioning for Azure
+Patch14: ci-DatasourceAzure-add-additional-logging-for-azure-dat.patch
+# For bz#1691986 - [Azure] [RHEL 8.1] Cloud-init fixes to support fast provisioning for Azure
+Patch15: ci-Azure-Changes-to-the-Hyper-V-KVP-Reporter.patch
+# For bz#1691986 - [Azure] [RHEL 8.1] Cloud-init fixes to support fast provisioning for Azure
+Patch16: ci-DataSourceAzure-Adjust-timeout-for-polling-IMDS.patch
+# For bz#1691986 - [Azure] [RHEL 8.1] Cloud-init fixes to support fast provisioning for Azure
+Patch17: ci-cc_mounts-check-if-mount-a-on-no-change-fstab-path.patch
+# For bz#1692914 - [8.1] [WALA][cloud] cloud-init dhclient-hook script has some unexpected side-effects on Azure
+Patch18: ci-Revert-azure-ensure-that-networkmanager-hook-script-.patch
+# For bz#1691986 - [Azure] [RHEL 8.1] Cloud-init fixes to support fast provisioning for Azure
Patch19: ci-Azure-Return-static-fallback-address-as-if-failed-to.patch
BuildArch: noarch
@@ -208,29 +208,42 @@ fi
%config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf
%changelog
-* Fri Jul 12 2019 Miroslav Rezanina <mrezanin@redhat.com> - 18.5-1.el8.4
-- Fix for TPS tests [bz#1687563]
- Resolve: bz#1687563
- (cloud-init 18.5 rebase for fast provisioning on Azure [RHEL 8.0.1])
-
-* Thu Jul 04 2019 Miroslav Rezanina <mrezanin@redhat.com> - 18.5-1.el8.3
-- ci-Azure-Return-static-fallback-address-as-if-failed-to.patch [bz#1648375]
-- Resolves: bz#1648375
- ([Azure] [RHEL 8] Cloud-init fixes to support fast provisioning for Azure[8.0.1])
-
-* Mon Jun 03 2019 Miroslav Rezanina <mrezanin@redhat.com> - 18.5-1.el8.2
-- ci-Azure-Ensure-platform-random_seed-is-always-serializ.patch [bz#1648375]
-- ci-DatasourceAzure-add-additional-logging-for-azure-dat.patch [bz#1648375]
-- ci-Azure-Changes-to-the-Hyper-V-KVP-Reporter.patch [bz#1648375]
-- ci-DataSourceAzure-Adjust-timeout-for-polling-IMDS.patch [bz#1648375]
-- ci-cc_mounts-check-if-mount-a-on-no-change-fstab-path.patch [bz#1648375]
-- Resolves: bz#1648375
- ([Azure] [RHEL 8] Cloud-init fixes to support fast provisioning for Azure)
-
-* Thu May 09 2019 Miroslav Rezanina <mrezanin@redhat.com> - 18.5-1.el8.1
-- ci-Revert-azure-ensure-that-networkmanager-hook-script-.patch [bz#1579237]
-- Resolves: bz#1579237
- ([WALA][cloud] cloud-init dhclient-hook script has some unexpected side-effects on Azure)
+* Mon Jul 15 2019 Miroslav Rezanina <mrezanin@redhat.com> - 18.5-7.el8
+- Fixing TPS [bz#1729864]
+- Resolves: bz#1729864
+ (cloud-init tps fail)
+
+* Thu Jul 04 2019 Miroslav Rezanina <mrezanin@redhat.com> - 18.5-6.el8
+- ci-Revert-azure-ensure-that-networkmanager-hook-script-.patch [bz#1692914]
+- ci-Azure-Return-static-fallback-address-as-if-failed-to.patch [bz#1691986]
+- Resolves: bz#1691986
+ ([Azure] [RHEL 8.1] Cloud-init fixes to support fast provisioning for Azure)
+- Resolves: bz#1692914
+ ([8.1] [WALA][cloud] cloud-init dhclient-hook script has some unexpected side-effects on Azure)
+
+* Mon Jun 10 2019 Miroslav Rezanina <mrezanin@redhat.com> - 18.5-5.el8
+- Improved gating testing [bz#1682786]
+- Resolves: bz#1682786
+ (cloud-init changes blocked until gating tests are added)
+
+* Mon Jun 03 2019 Miroslav Rezanina <mrezanin@redhat.com> - 18.5-4.el8
+- ci-Azure-Ensure-platform-random_seed-is-always-serializ.patch [bz#1691986]
+- ci-DatasourceAzure-add-additional-logging-for-azure-dat.patch [bz#1691986]
+- ci-Azure-Changes-to-the-Hyper-V-KVP-Reporter.patch [bz#1691986]
+- ci-DataSourceAzure-Adjust-timeout-for-polling-IMDS.patch [bz#1691986]
+- ci-cc_mounts-check-if-mount-a-on-no-change-fstab-path.patch [bz#1691986]
+- Resolves: bz#1691986
+ ([Azure] [RHEL 8.1] Cloud-init fixes to support fast provisioning for Azure)
+
+* Tue Apr 16 2019 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - 18.5-3.el8
+- ci-Adding-gating-tests-for-Azure-ESXi-and-AWS.patch [bz#1682786]
+- Resolves: bz#1682786
+ (cloud-init changes blocked until gating tests are added)
+
+* Wed Apr 10 2019 Danilo C. L. de Paula <ddepaula@redhat.com> - 18.5-2
+- Adding gating.yaml file
+- Resolves: rhbz#1682786
+ (cloud-init changes blocked until gating tests are added)
* Wed Apr 10 2019 Danilo de Paula <ddepaula@redhat.com: - 18.5-1.el8
- Rebase to cloud-init 18.5