summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-11-06 16:02:00 +0000
committerGerrit Code Review <review@openstack.org>2012-11-06 16:02:00 +0000
commitf45c67e3565f7f8176e45fb4b960ec238ddbbdeb (patch)
tree5d2e7b659a5e9b593da5ffd094ed16d6e76660a9
parent319233bf1be354abb20f555a4b62f67173438930 (diff)
parentbcf8af965e0fc487d27b703e1bbefee4ab433d18 (diff)
downloadnova-f45c67e3565f7f8176e45fb4b960ec238ddbbdeb.tar.gz
nova-f45c67e3565f7f8176e45fb4b960ec238ddbbdeb.tar.xz
nova-f45c67e3565f7f8176e45fb4b960ec238ddbbdeb.zip
Merge "Fixes volume attach issue on Hyper-V"
-rwxr-xr-xbin/nova-compute9
1 files changed, 8 insertions, 1 deletions
diff --git a/bin/nova-compute b/bin/nova-compute
index 2ff98ccfc..08c3862d2 100755
--- a/bin/nova-compute
+++ b/bin/nova-compute
@@ -20,7 +20,14 @@
"""Starter script for Nova Compute."""
import eventlet
-eventlet.monkey_patch()
+import os
+
+if os.name == 'nt':
+ # eventlet monkey patching causes subprocess.Popen to fail on Windows
+ # when using pipes due to missing non blocking I/O support
+ eventlet.monkey_patch(os=False)
+else:
+ eventlet.monkey_patch()
import os
import sys