summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQingXin Meng <mengqxqx@cn.ibm.com>2014-03-11 02:36:32 -0700
committerQingXin Meng <mengqxqx@cn.ibm.com>2014-03-11 02:36:32 -0700
commitc6031bdbaa440cafcd7610091197a5b381fbec95 (patch)
treef72f757d9b43e10a242e179978df3168f90c2b15
parent1b790cc59720edd0cc77b3b5fb2114ce4c56b1ce (diff)
downloadnova-c6031bdbaa440cafcd7610091197a5b381fbec95.tar.gz
Fix docstring for disk_cachemodes
The docstring for the disk_cachemodes option implied a syntax that is incorrect for a ListOpt. Change the example to match exactly what you would put in the config file for it to work. Change-Id: Ie999d2799dba6c47facdc771e1cf6081d28d6b85 Closes-Bug: #1106423 (cherry picked from commit 1df9b26b51ff3a153b93d79e25bef454e08a8e38)
-rw-r--r--etc/nova/nova.conf.sample2
-rw-r--r--nova/virt/libvirt/driver.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/etc/nova/nova.conf.sample b/etc/nova/nova.conf.sample
index 059b996ee5..daa5dcab3c 100644
--- a/etc/nova/nova.conf.sample
+++ b/etc/nova/nova.conf.sample
@@ -2050,7 +2050,7 @@
#xen_hvmloader_path=/usr/lib/xen/boot/hvmloader
# Specific cachemodes to use for different disk types e.g:
-# ["file=directsync","block=none"] (list value)
+# file=directsync,block=none (list value)
#disk_cachemodes=
# Which pcpus can be used by vcpus of instance e.g:
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
index c78605526b..a789444dcd 100644
--- a/nova/virt/libvirt/driver.py
+++ b/nova/virt/libvirt/driver.py
@@ -213,7 +213,7 @@ libvirt_opts = [
cfg.ListOpt('disk_cachemodes',
default=[],
help='Specific cachemodes to use for different disk types '
- 'e.g: ["file=directsync","block=none"]'),
+ 'e.g: file=directsync,block=none'),
cfg.StrOpt('vcpu_pin_set',
help='Which pcpus can be used by vcpus of instance '
'e.g: "4-12,^8,15"'),