summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-11-14 15:11:59 +0000
committerGerrit Code Review <review@openstack.org>2012-11-14 15:11:59 +0000
commit0fadce2d59b2a77b9b5745dd1ca60e9a4f555d24 (patch)
tree0a9aa78c6db53914591f5c9ebaee209e8a007961
parent6375ca7eb56b13bb4794b843a5eaef8118f0dff6 (diff)
parentbb897502e0a1f30376c94ce4e42f9baae3011583 (diff)
downloadnova-0fadce2d59b2a77b9b5745dd1ca60e9a4f555d24.tar.gz
nova-0fadce2d59b2a77b9b5745dd1ca60e9a4f555d24.tar.xz
nova-0fadce2d59b2a77b9b5745dd1ca60e9a4f555d24.zip
Merge "fix flag type define error."
-rw-r--r--nova/virt/xenapi/agent.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/virt/xenapi/agent.py b/nova/virt/xenapi/agent.py
index 9fad07898..dac6061a9 100644
--- a/nova/virt/xenapi/agent.py
+++ b/nova/virt/xenapi/agent.py
@@ -50,7 +50,7 @@ xenapi_agent_opts = [
'configuration is not injected into the image. '
'Used if compute_driver=xenapi.XenAPIDriver and '
' flat_injected=True'),
- cfg.StrOpt('xenapi_disable_agent',
+ cfg.BoolOpt('xenapi_disable_agent',
default=False,
help='Disable XenAPI agent. Reduces the amount of time '
'it takes nova to detect that a VM has started, when '