Merge lp:~cbehrens/nova/lp741246 into lp:~hudson-openstack/nova/trunk
Proposed by
Chris Behrens
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Josh Kearney | ||||
Approved revision: | 925 | ||||
Merged at revision: | 937 | ||||
Proposed branch: | lp:~cbehrens/nova/lp741246 | ||||
Merge into: | lp:~hudson-openstack/nova/trunk | ||||
Diff against target: |
125 lines (+77/-6) 1 file modified
plugins/xenserver/xenapi/etc/xapi.d/plugins/agent (+77/-6) |
||||
To merge this branch: | bzr merge lp:~cbehrens/nova/lp741246 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Josh Kearney (community) | Approve | ||
Ed Leafe (community) | Approve | ||
Review via email: mp+55627@code.launchpad.net |
Description of the change
Fixes bug 741246. Ed Leafe's inject_file method for the agent plugin was mistakenly never committed after having to fix commits under wrong email address. vmops makes calls to this (previously) missing method.
To post a comment you must log in.
The uuid module is not available in Python 2.4, which is what plugins will run under. So change the 'import uuid' line (diff #16) to 'import commands', and then change diff line #96 from:
tmp_id = str(uuid.uuid4())
to:
tmp_id = commands. getoutput( "uuidgen" )