summaryrefslogtreecommitdiffstats
path: root/puppet/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-05-25 07:20:15 +0000
committerGerrit Code Review <review@openstack.org>2016-05-25 07:20:15 +0000
commitc7d996765ba86d245fb2a4f0ade01142689aafb0 (patch)
tree006c1216f737623649fa5bcec94fa2da67ef1624 /puppet/manifests
parentd1e548cbfaa24bdaf4659b864bd61b5f6f769908 (diff)
parent69ff93f00dcd54814a87ea567870408c86bcb582 (diff)
Merge "Optimize Nova disk_cachemodes and hw_disk_discard options for RBD"
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/overcloud_compute.pp13
1 files changed, 11 insertions, 2 deletions
diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp
index cc58cb14..43e87789 100644
--- a/puppet/manifests/overcloud_compute.pp
+++ b/puppet/manifests/overcloud_compute.pp
@@ -90,8 +90,17 @@ if str2bool(hiera('nova::use_ipv6', false)) {
} else {
$vncserver_listen = '0.0.0.0'
}
-class { '::nova::compute::libvirt' :
- vncserver_listen => $vncserver_listen,
+
+if $rbd_ephemeral_storage {
+ class { '::nova::compute::libvirt':
+ libvirt_disk_cachemodes => ['network=writeback'],
+ libvirt_hw_disk_discard => 'unmap',
+ vncserver_listen => $vncserver_listen,
+ }
+} else {
+ class { '::nova::compute::libvirt' :
+ vncserver_listen => $vncserver_listen,
+ }
}
nova_config {