diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-09-20 07:39:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-09-20 07:39:40 +0000 |
| commit | 312ccad26ea7156f125114179f0cb06191da8e99 (patch) | |
| tree | f39030688ff9f532e5ef29cb3068955f23462577 | |
| parent | 7157085837fd9de27bba5ff8dc575956d26b8a27 (diff) | |
| parent | c6031bdbaa440cafcd7610091197a5b381fbec95 (diff) | |
| download | nova-stable/havana.tar.gz | |
Merge "Fix docstring for disk_cachemodes" into stable/havanahavana-eol2013.2.4stable/havana
| -rw-r--r-- | etc/nova/nova.conf.sample | 2 | ||||
| -rw-r--r-- | nova/virt/libvirt/driver.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/etc/nova/nova.conf.sample b/etc/nova/nova.conf.sample index ba916db0ba..6fb6b41097 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 00ff77eb31..a819636cdf 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"'), |