cloud-init-dev team mailing list archive
-
cloud-init-dev team
-
Mailing list archive
-
Message #00588
[Merge] lp:~i-franz/cloud-init/enable-vmtools-for-ovf into lp:cloud-init
Franz Schwartau has proposed merging lp:~i-franz/cloud-init/enable-vmtools-for-ovf into lp:cloud-init.
Requested reviews:
cloud init development team (cloud-init-dev)
For more details, see:
https://code.launchpad.net/~i-franz/cloud-init/enable-vmtools-for-ovf/+merge/244452
Enable transport for vmtools in DataSourceOVF
--
Your team cloud init development team is requested to review the proposed merge of lp:~i-franz/cloud-init/enable-vmtools-for-ovf into lp:cloud-init.
=== modified file 'cloudinit/sources/DataSourceOVF.py'
--- cloudinit/sources/DataSourceOVF.py 2014-09-22 18:35:03 +0000
+++ cloudinit/sources/DataSourceOVF.py 2014-12-11 14:59:38 +0000
@@ -64,7 +64,7 @@
found.append(seed)
else:
np = {'iso': transport_iso9660,
- 'vmware-guestd': transport_vmware_guestd, }
+ 'vmware-tools': transport_vmware_tools, }
name = None
for (name, transfunc) in np.iteritems():
(contents, _dev, _fname) = transfunc()
@@ -226,17 +226,16 @@
return (False, None, None)
-def transport_vmware_guestd():
+def transport_vmware_tools():
# http://blogs.vmware.com/vapp/2009/07/ \
# selfconfiguration-and-the-ovf-environment.html
- # try:
- # cmd = ['vmware-guestd', '--cmd', 'info-get guestinfo.ovfEnv']
- # (out, err) = subp(cmd)
- # return(out, 'guestinfo.ovfEnv', 'vmware-guestd')
- # except:
- # # would need to error check here and see why this failed
- # # to know if log/error should be raised
- # return(False, None, None)
+ for tool in ['vmtoolsd', 'vmware-guestd']:
+ try:
+ cmd = [tool, '--cmd', 'info-get guestinfo.ovfEnv']
+ (out, err) = util.subp(cmd)
+ return(out, 'guestinfo.ovfEnv', 'vmware-tools')
+ except util.ProcessExecutionError:
+ pass
return (False, None, None)
Follow ups