Merge lp:~rlucio/nova/lp695467 into lp:~hudson-openstack/nova/trunk

Proposed by Ryan Lucio
Status: Merged
Approved by: Rick Clark
Approved revision: 503
Merged at revision: 503
Proposed branch: lp:~rlucio/nova/lp695467
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 13 lines (+3/-0)
1 file modified
nova/virt/libvirt_conn.py (+3/-0)
To merge this branch: bzr merge lp:~rlucio/nova/lp695467
Reviewer Review Type Date Requested Status
Rick Clark (community) Approve
Vish Ishaya (community) Approve
Review via email: mp+44865@code.launchpad.net

Description of the change

This branch fixes an issue where VM creation fails because of a missing flag definition for 'injected_network_template'. See Bug #695467 for more info.

To post a comment you must log in.
Revision history for this message
Vish Ishaya (vishvananda) wrote :

lgtm. Not sure how this got removed.

review: Approve
Revision history for this message
Rick Clark (dendrobates) wrote :

lgtm

review: Approve
Revision history for this message
Soren Hansen (soren) wrote :

Seems I accidentally removed it in r471 (the raw disk branch) when I
was consolidating the libvirt templates. Thanks for catching this.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'nova/virt/libvirt_conn.py'
2--- nova/virt/libvirt_conn.py 2010-12-29 02:24:08 +0000
3+++ nova/virt/libvirt_conn.py 2010-12-29 19:42:14 +0000
4@@ -68,6 +68,9 @@
5 flags.DEFINE_string('rescue_image_id', 'ami-rescue', 'Rescue ami image')
6 flags.DEFINE_string('rescue_kernel_id', 'aki-rescue', 'Rescue aki image')
7 flags.DEFINE_string('rescue_ramdisk_id', 'ari-rescue', 'Rescue ari image')
8+flags.DEFINE_string('injected_network_template',
9+ utils.abspath('virt/interfaces.template'),
10+ 'Template file for injected network')
11 flags.DEFINE_string('libvirt_xml_template',
12 utils.abspath('virt/libvirt.xml.template'),
13 'Libvirt XML Template')