summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/nova/nova.conf.sample2
-rw-r--r--nova/tests/fakelibvirt.py6
-rw-r--r--nova/virt/libvirt/connection.py2
3 files changed, 8 insertions, 2 deletions
diff --git a/etc/nova/nova.conf.sample b/etc/nova/nova.conf.sample
index 8726f5dcb..a84d212da 100644
--- a/etc/nova/nova.conf.sample
+++ b/etc/nova/nova.conf.sample
@@ -1417,7 +1417,7 @@
#### soft reboot request is made. We fall back to hard reboot if
#### instance does not shutdown within this window.
-# libvirt_nonblocking=false
+# libvirt_nonblocking=true
#### (BoolOpt) Use a separated OS thread pool to realize non-blocking
#### libvirt calls
diff --git a/nova/tests/fakelibvirt.py b/nova/tests/fakelibvirt.py
index 3e4c63719..4350a8878 100644
--- a/nova/tests/fakelibvirt.py
+++ b/nova/tests/fakelibvirt.py
@@ -797,3 +797,9 @@ def openAuth(uri, auth, flags):
"this auth method"))
return Connection(uri, readonly=False)
+
+
+virDomain = Domain
+
+
+virConnect = Connection
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 6f0f1f630..c9f8a35b4 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -156,7 +156,7 @@ libvirt_opts = [
' soft reboot request is made. We fall back to hard reboot'
' if instance does not shutdown within this window.'),
cfg.BoolOpt('libvirt_nonblocking',
- default=False,
+ default=True,
help='Use a separated OS thread pool to realize non-blocking'
' libvirt calls'),
# force_config_drive is a string option, to allow for future behaviors