diff --git a/manifests/profile/base/nova/compute_libvirt_shared.pp b/manifests/profile/base/nova/compute_libvirt_shared.pp index c89e69f04..d341f3bb0 100644 --- a/manifests/profile/base/nova/compute_libvirt_shared.pp +++ b/manifests/profile/base/nova/compute_libvirt_shared.pp @@ -38,8 +38,9 @@ class tripleo::profile::base::nova::compute_libvirt_shared ( ) { if $step >= 4 { # Ceph + Libvirt - $rbd_ephemeral_storage = hiera('nova::compute::rbd::ephemeral_storage', false) + $rbd_ephemeral_storage = hiera('nova::compute::rbd::ephemeral_storage', false) $rbd_persistent_storage = hiera('rbd_persistent_storage', false) + $rbd_disk_cachemodes = hiera('rbd_disk_cachemodes', ['network=writeback']) if $rbd_ephemeral_storage or $rbd_persistent_storage { include nova::compute::rbd exec{ "exec-setfacl-${nova_rbd_client_name}-nova": @@ -56,7 +57,7 @@ class tripleo::profile::base::nova::compute_libvirt_shared ( if $rbd_ephemeral_storage { class { 'nova::compute::libvirt': - disk_cachemodes => ['network=writeback'], + disk_cachemodes => $rbd_disk_cachemodes, hw_disk_discard => 'unmap', } } else { diff --git a/releasenotes/notes/rbd-disk-cache-modes-b6b75fa2e52b8915.yaml b/releasenotes/notes/rbd-disk-cache-modes-b6b75fa2e52b8915.yaml new file mode 100644 index 000000000..6b8b19ea5 --- /dev/null +++ b/releasenotes/notes/rbd-disk-cache-modes-b6b75fa2e52b8915.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + New hiera setting `rbd_disk_cachemodes` allows to override + the disk cache modes for RBD. Defaults to ['network=writeback'].