Merge lp:~vishvananda/nova/lp702741 into lp:~hudson-openstack/nova/trunk
Proposed by
Vish Ishaya
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Soren Hansen | ||||
Approved revision: | 568 | ||||
Merged at revision: | 576 | ||||
Proposed branch: | lp:~vishvananda/nova/lp702741 | ||||
Merge into: | lp:~hudson-openstack/nova/trunk | ||||
Diff against target: |
131 lines (+20/-17) 3 files modified
nova/tests/test_virt.py (+6/-3) nova/virt/libvirt.xml.template (+5/-5) nova/virt/libvirt_conn.py (+9/-9) |
||||
To merge this branch: | bzr merge lp:~vishvananda/nova/lp702741 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Devin Carlen (community) | Approve | ||
Thierry Carrez (community) | Approve | ||
Soren Hansen (community) | Approve | ||
Review via email: mp+46245@code.launchpad.net |
Description of the change
Works around the app-armor problem of requiring disks with backing files to be named appropriately by changing the name of our extra disks.
disk is fine, as is disk.local and disk.rescue.
To post a comment you must log in.
lgtm