1) merge trunk

2) removed preconfigure_xenstore
3) added jkey for broadcast address in inject_network_info
4) added 2 flags:
	4.1) xenapi_inject_image (default True)
	This flag allows for turning off data injection by mounting the image in the VDI
	(agreed with Trey Morris)
	4.2) xenapi_agent_path (default /usr/bin/xe-update-networking)
	This flag specifies the path where the agent should be located. It makes sense only
	if the above flag is True. If the agent is found, data injection is not performed
This commit is contained in:
Salvatore Orlando
2011-02-28 15:54:47 +00:00
220 changed files with 2788 additions and 1454 deletions

View File

@@ -37,6 +37,7 @@ Joshua McKenty <jmckenty@gmail.com>
Justin Santa Barbara <justin@fathomdb.com>
Kei Masumoto <masumotok@nttdata.co.jp>
Ken Pepple <ken.pepple@gmail.com>
Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Koji Iida <iida.koji@lab.ntt.co.jp>
Lorin Hochstein <lorin@isi.edu>
Matt Dietz <matt.dietz@rackspace.com>