From 9e904bbc3336b96475bfd00fb3bf1262ae4de49f Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Thu, 17 Nov 2016 14:46:23 -0500 Subject: Add activate_datasource, for datasource specific code paths. This adds a call to 'activate_datasource'. That will be called during init stage (or init-local in the event of a 'local' dsmode). It is present so that the datasource can do platform specific operations that may be necessary. It is passed the fully rendered cloud-config and whether or not the instance is a new instance. The Azure datasource uses this to address formatting of the ephemeral devices. It does so by a.) waiting for the device to come online b.) removing the marker files for the disk_setup and mounts modules if it finds that the ephemeral device has been reset. LP: #1611074 --- cloudinit/config/cc_mounts.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'cloudinit/config/cc_mounts.py') diff --git a/cloudinit/config/cc_mounts.py b/cloudinit/config/cc_mounts.py index dfc4b598..452c9e83 100644 --- a/cloudinit/config/cc_mounts.py +++ b/cloudinit/config/cc_mounts.py @@ -312,7 +312,8 @@ def handle_swapcfg(swapcfg): def handle(_name, cfg, cloud, log, _args): # fs_spec, fs_file, fs_vfstype, fs_mntops, fs-freq, fs_passno def_mnt_opts = "defaults,nobootwait" - if cloud.distro.uses_systemd(): + uses_systemd = cloud.distro.uses_systemd() + if uses_systemd: def_mnt_opts = "defaults,nofail,x-systemd.requires=cloud-init.service" defvals = [None, None, "auto", def_mnt_opts, "0", "2"] @@ -447,7 +448,12 @@ def handle(_name, cfg, cloud, log, _args): except Exception: util.logexc(log, "Failed to make '%s' config-mount", d) + activate_cmd = ["mount", "-a"] + if uses_systemd: + activate_cmd = ["systemctl", "daemon-reload"] + fmt = "Activate mounts: %s:" + ' '.join(activate_cmd) try: - util.subp(("mount", "-a")) + util.subp(activate_cmd) + LOG.debug(fmt, "PASS") except util.ProcessExecutionError: - util.logexc(log, "Activating mounts via 'mount -a' failed") + util.logexc(log, fmt, "FAIL") -- cgit v1.2.3