diff options
| author | Josh Kearney <josh.kearney@rackspace.com> | 2010-12-30 15:02:34 -0600 |
|---|---|---|
| committer | Josh Kearney <josh.kearney@rackspace.com> | 2010-12-30 15:02:34 -0600 |
| commit | 44c83db6130e2ac59fc0649c4e37d906e348dd78 (patch) | |
| tree | 8d3e68e4e159aa6fda226f89fb0ae892a67c9523 | |
| parent | 5b8137b2f50a4ed3eb105e38cefa280927f1c2ea (diff) | |
| parent | 0880026253d0de67afd7c80415b332f72764457d (diff) | |
| download | nova-44c83db6130e2ac59fc0649c4e37d906e348dd78.tar.gz nova-44c83db6130e2ac59fc0649c4e37d906e348dd78.tar.xz nova-44c83db6130e2ac59fc0649c4e37d906e348dd78.zip | |
Merged trunk
| -rw-r--r-- | nova/tests/test_scheduler.py | 1 | ||||
| -rw-r--r-- | nova/virt/libvirt_conn.py | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/nova/tests/test_scheduler.py b/nova/tests/test_scheduler.py index 91517cc5d..78e4a1c77 100644 --- a/nova/tests/test_scheduler.py +++ b/nova/tests/test_scheduler.py @@ -33,6 +33,7 @@ from nova.scheduler import driver FLAGS = flags.FLAGS flags.DECLARE('max_cores', 'nova.scheduler.simple') +flags.DECLARE('stub_network', 'nova.compute.manager') class TestDriver(driver.Scheduler): diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py index 132d96fea..8407938c6 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') |