From d2a1919d5c057cd7e8bb46306d003a14ad351183 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Fri, 11 Feb 2022 01:00:32 -0500 Subject: [PATCH] * Fri Feb 11 2022 Miroslav Rezanina - 21.1-18 - ci-Add-_netdev-option-to-mount-Azure-ephemeral-disk-121.patch [bz#1998445] - Resolves: bz#1998445 ([Azure][RHEL-9] ordering cycle exists after reboot) --- ...on-to-mount-Azure-ephemeral-disk-121.patch | 43 +++++++++++++++++++ cloud-init.spec | 9 +++- 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 ci-Add-_netdev-option-to-mount-Azure-ephemeral-disk-121.patch diff --git a/ci-Add-_netdev-option-to-mount-Azure-ephemeral-disk-121.patch b/ci-Add-_netdev-option-to-mount-Azure-ephemeral-disk-121.patch new file mode 100644 index 0000000..2b9367d --- /dev/null +++ b/ci-Add-_netdev-option-to-mount-Azure-ephemeral-disk-121.patch @@ -0,0 +1,43 @@ +From 244a3f9059fc95a5e644bd7868aed8060d9edc61 Mon Sep 17 00:00:00 2001 +From: Eduardo Otubo +Date: Fri, 4 Feb 2022 16:04:31 +0100 +Subject: [PATCH] Add _netdev option to mount Azure ephemeral disk (#1213) + +RH-Author: Eduardo Otubo +RH-MergeRequest: 19: Add _netdev option to mount Azure ephemeral disk (#1213) +RH-Commit: [1/1] e44291a50634594b8a0505cab3415d5c58cc34c4 (otubo/cloud-init-src) +RH-Bugzilla: 1998445 +RH-Acked-by: Mohamed Gamal Morsy +RH-Acked-by: Vitaly Kuznetsov +RH-Acked-by: Emanuele Giuseppe Esposito + +The ephemeral disk depends on a functional network to be mounted. Even +though it depends on cloud-init.service, sometimes an ordering cycle is +noticed on the instance. If the option "_netdev" is added the problem is +gone. + +rhbz: #1998445 + +Signed-off-by: Eduardo Otubo otubo@redhat.com +--- + cloudinit/config/cc_mounts.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/cloudinit/config/cc_mounts.py b/cloudinit/config/cc_mounts.py +index c22d1698..5125f17c 100644 +--- a/cloudinit/config/cc_mounts.py ++++ b/cloudinit/config/cc_mounts.py +@@ -362,7 +362,9 @@ def handle(_name, cfg, cloud, log, _args): + def_mnt_opts = "defaults,nobootwait" + uses_systemd = cloud.distro.uses_systemd() + if uses_systemd: +- def_mnt_opts = "defaults,nofail,x-systemd.requires=cloud-init.service" ++ def_mnt_opts = ( ++ "defaults,nofail, x-systemd.requires=cloud-init.service, _netdev" ++ ) + + defvals = [None, None, "auto", def_mnt_opts, "0", "2"] + defvals = cfg.get("mount_default_fields", defvals) +-- +2.27.0 + diff --git a/cloud-init.spec b/cloud-init.spec index c16a07c..1270638 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -1,6 +1,6 @@ Name: cloud-init Version: 21.1 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Cloud instance init scripts License: ASL 2.0 or GPLv3 URL: http://launchpad.net/cloud-init @@ -56,6 +56,8 @@ Patch24: ci-Azure-Retrieve-username-and-hostname-from-IMDS-865.patch Patch25: ci-Azure-Retry-net-metadata-during-nic-attach-for-non-t.patch # For bz#2042351 - [RHEL-9] Support for provisioning Azure VM with userdata Patch26: ci-Azure-adding-support-for-consuming-userdata-from-IMD.patch +# For bz#1998445 - [Azure][RHEL-9] ordering cycle exists after reboot +Patch27: ci-Add-_netdev-option-to-mount-Azure-ephemeral-disk-121.patch # Source-git patches @@ -257,6 +259,11 @@ fi %config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf %changelog +* Fri Feb 11 2022 Miroslav Rezanina - 21.1-18 +- ci-Add-_netdev-option-to-mount-Azure-ephemeral-disk-121.patch [bz#1998445] +- Resolves: bz#1998445 + ([Azure][RHEL-9] ordering cycle exists after reboot) + * Mon Feb 07 2022 Miroslav Rezanina - 21.1-17 - ci-Add-flexibility-to-IMDS-api-version-793.patch [bz#2042351] - ci-Azure-helper-Ensure-Azure-http-handler-sleeps-betwee.patch [bz#2042351]