summaryrefslogtreecommitdiff
path: root/nova/virt/driver.py
diff options
context:
space:
mode:
Diffstat (limited to 'nova/virt/driver.py')
-rw-r--r--nova/virt/driver.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/nova/virt/driver.py b/nova/virt/driver.py
index 5ed9974a7d..4dd1f222d6 100644
--- a/nova/virt/driver.py
+++ b/nova/virt/driver.py
@@ -48,6 +48,16 @@ driver_opts = [
cfg.BoolOpt('use_cow_images',
default=True,
help='Whether to use cow images'),
+ cfg.BoolOpt('vif_plugging_is_fatal',
+ default=True,
+ help="Fail instance boot if vif plugging fails"),
+ cfg.IntOpt('vif_plugging_timeout',
+ default=300,
+ help='Number of seconds to wait for neutron vif plugging '
+ 'events to arrive before continuing or failing (see '
+ 'vif_plugging_is_fatal). If this is set to zero and '
+ 'vif_plugging_is_fatal is False, events should not '
+ 'be expected to arrive at all.'),
]
CONF = cfg.CONF