summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan Lucio <rlucio@internap.com>2010-12-29 20:09:16 +0000
committerTarmac <>2010-12-29 20:09:16 +0000
commit9a84a2bb4abb73d4022dbc8d699600f07d19267e (patch)
tree57c64e39657b93c1fa0941f94dbbdc4475ea66a4
parent90acbd3dd834fdef6f1000b69dfba4d4c1d12fd5 (diff)
parent34f5bed4d9c99af58c83b82b499f898c270124a8 (diff)
downloadnova-9a84a2bb4abb73d4022dbc8d699600f07d19267e.tar.gz
nova-9a84a2bb4abb73d4022dbc8d699600f07d19267e.tar.xz
nova-9a84a2bb4abb73d4022dbc8d699600f07d19267e.zip
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.
-rw-r--r--nova/virt/libvirt_conn.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index f6a218fa4..39215c4e1 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -68,6 +68,9 @@ FLAGS = flags.FLAGS
flags.DEFINE_string('rescue_image_id', 'ami-rescue', 'Rescue ami image')
flags.DEFINE_string('rescue_kernel_id', 'aki-rescue', 'Rescue aki image')
flags.DEFINE_string('rescue_ramdisk_id', 'ari-rescue', 'Rescue ari image')
+flags.DEFINE_string('injected_network_template',
+ utils.abspath('virt/interfaces.template'),
+ 'Template file for injected network')
flags.DEFINE_string('libvirt_xml_template',
utils.abspath('virt/libvirt.xml.template'),
'Libvirt XML Template')