summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEduardo Otubo <otubo@redhat.com>2022-02-04 16:04:31 +0100
committerGitHub <noreply@github.com>2022-02-04 09:04:31 -0600
commita1cfd1b48993ce912986204f5249eb67724636d5 (patch)
tree81dec712accfb62fbd581d4b4b6e135cbd8cbc5c
parentaa47ec0ce020c56afb4308476a3b85254f15569d (diff)
downloadvyos-cloud-init-a1cfd1b48993ce912986204f5249eb67724636d5.tar.gz
vyos-cloud-init-a1cfd1b48993ce912986204f5249eb67724636d5.zip
Add _netdev option to mount Azure ephemeral disk (#1213)
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
-rw-r--r--cloudinit/config/cc_mounts.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/cloudinit/config/cc_mounts.py b/cloudinit/config/cc_mounts.py
index ec2e46ff..a81ae952 100644
--- a/cloudinit/config/cc_mounts.py
+++ b/cloudinit/config/cc_mounts.py
@@ -392,7 +392,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)