forked from rpms/cloud-init
44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
|
From 244a3f9059fc95a5e644bd7868aed8060d9edc61 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Eduardo Otubo <otubo@redhat.com>
|
||
|
|
Date: Fri, 4 Feb 2022 16:04:31 +0100
|
||
|
|
Subject: [PATCH] Add _netdev option to mount Azure ephemeral disk (#1213)
|
||
|
|
|
||
|
|
RH-Author: Eduardo Otubo <otubo@redhat.com>
|
||
|
|
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 <mmorsy@redhat.com>
|
||
|
|
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||
|
|
RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
|
||
|
|
|
||
|
|
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
|
||
|
|
|