From 9f171511042d29542d8578957c6692c2c9457583 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Thu, 16 Feb 2012 16:52:58 -0500 Subject: DataSourceNoCloud: allow reading user-data and meta-data from simple files This allows you to attach a disk in ISO9660 or vfat filesystem format labeled 'cidata' with 'user-data' and 'meta-data' on it. It provides a much easier way to interact with cloud-init in nocloud than mounting the image or the OVF method. --- cloudinit/util.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cloudinit/util.py') diff --git a/cloudinit/util.py b/cloudinit/util.py index b53aa5fe..0a691dcf 100644 --- a/cloudinit/util.py +++ b/cloudinit/util.py @@ -681,7 +681,7 @@ def mount_callback_umount(device, callback, data=None): umount = False if device in mounted: - mountpoint = mounted[device][2] + mountpoint = "%s/" % mounted[device][2] else: tmpd = tempfile.mkdtemp() @@ -695,7 +695,7 @@ def mount_callback_umount(device, callback, data=None): print exc.output[1] raise mountFailedError(exc.output[1]) - mountpoint = tmpd + mountpoint = "%s/" % tmpd try: if data == None: -- cgit v1.2.3