DataSourceOVF: small fix for iso9660 transport

This is not really a problem, because nothing would call transport_iso9660
with 'require_iso' as False, but if it did, then we would have still
required iso9660 filesystem on the mount.

ChangeLog

@@ -1,5 +1,6 @@
 0.7.3:
  - fix omnibus chef installer (LP: #1182265) [Chris Wing]
+ - small fix for OVF datasource for iso transport on non-iso9660 filesystem
 0.7.2:
  - add a debian watch file
  - add 'sudo' entry to ubuntu's default user (LP: #1080717)

cloudinit/sources/DataSourceOVF.py

@@ -194,6 +194,11 @@ def transport_iso9660(require_iso=True):
         if contents is not False:
             return (contents, dev, fname)
 
+    if require_iso:
+        mtype = "iso9660"
+    else:
+        mtype = None
+
     devs = os.listdir("/dev/")
     devs.sort()
     for dev in devs:
@@ -211,7 +216,7 @@ def transport_iso9660(require_iso=True):
 
         try:
             (fname, contents) = util.mount_cb(fullp,
-                                               get_ovf_env, mtype="iso9660")
+                                               get_ovf_env, mtype=mtype)
         except util.MountFailedError:
             LOG.debug("%s not mountable as iso9660" % fullp)
             continue