diff options
| author | Salvatore Orlando <salvatore.orlando@eu.citrix.com> | 2011-02-28 15:54:47 +0000 |
|---|---|---|
| committer | Salvatore Orlando <salvatore.orlando@eu.citrix.com> | 2011-02-28 15:54:47 +0000 |
| commit | a3b3f4d97c46edc4cd3bd80c21238991f01a7998 (patch) | |
| tree | 23f3195a0ff928bff58914e9637198c21e51f3c0 /nova/openstack | |
| parent | 76ec5af4e776ae036dc41390389c8334d9799049 (diff) | |
| parent | edf5da85648659b1a7ad105248d69ef9f8c977e4 (diff) | |
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
Diffstat (limited to 'nova/openstack')
0 files changed, 0 insertions, 0 deletions