From 8a3cf6aa87ce5c4bcd9bc2713b7b2a86546bc450 Mon Sep 17 00:00:00 2001 From: Bogdan Dobrelya Date: Fri, 21 May 2021 10:00:17 +0200 Subject: [PATCH] Add param for RBD disk cache modes New parameter to control RBD disk caching modes. Depends-On: https://review.opendev.org/792326 Change-Id: I6fac9ff39892c08453c050816f61a4bcee4bddf0 Signed-off-by: Bogdan Dobrelya --- deployment/nova/nova-compute-container-puppet.yaml | 9 ++++++++- deployment/nova/nova-libvirt-container-puppet.yaml | 8 +++++++- .../notes/rbd-disk-cache-modes-284a73271741ea62.yaml | 5 +++++ 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/rbd-disk-cache-modes-284a73271741ea62.yaml diff --git a/deployment/nova/nova-compute-container-puppet.yaml b/deployment/nova/nova-compute-container-puppet.yaml index eaa8edd366..a1eb1f2506 100644 --- a/deployment/nova/nova-compute-container-puppet.yaml +++ b/deployment/nova/nova-compute-container-puppet.yaml @@ -787,6 +787,12 @@ parameters: description: The name of the stack/plan. type: string + RbdDiskCachemodes: + type: comma_delimited_list + default: ['network=writeback'] + description: > + Disk cachemodes for RBD backend. + parameter_groups: - label: deprecated description: | @@ -1093,6 +1099,7 @@ outputs: - {get_param: CephClientUserName} tripleo::profile::base::nova::compute::cinder_nfs_backend: {get_param: CinderEnableNfsBackend} rbd_persistent_storage: {get_param: CinderEnableRbdBackend} + rbd_disk_cachemodes: {get_param: RbdDiskCachemodes} nova::keystone::authtoken::project_name: 'service' nova::keystone::authtoken::user_domain_name: 'Default' nova::keystone::authtoken::project_domain_name: 'Default' @@ -1115,7 +1122,7 @@ outputs: nova::compute::live_migration_wait_for_vif_plug: {get_param: NovaLiveMigrationWaitForVIFPlug} nova::migration::libvirt::live_migration_permit_post_copy: if: - - permit_post_copy_set + - permit_post_copy_set - {get_attr: [RoleParametersValue, value, nova_permit_post_copy]} - if: - live_migration_optimization_set diff --git a/deployment/nova/nova-libvirt-container-puppet.yaml b/deployment/nova/nova-libvirt-container-puppet.yaml index a1937a29ef..b013eda458 100644 --- a/deployment/nova/nova-libvirt-container-puppet.yaml +++ b/deployment/nova/nova-libvirt-container-puppet.yaml @@ -297,6 +297,11 @@ parameters: description: > Setting this to a unique value will re-run any deployment tasks which perform configuration on a Heat stack-update. + RbdDiskCachemodes: + type: comma_delimited_list + default: ['network=writeback'] + description: > + Disk cachemodes for RBD backend. conditions: use_tls_for_live_migration: @@ -364,7 +369,7 @@ resources: VhostuserSocketGroup: {get_param: VhostuserSocketGroup} QemuMemoryBackingDir: {get_param: QemuMemoryBackingDir} NovaLibvirtOptVolumes: {get_param: NovaLibvirtOptVolumes} - + ContainersCommon: type: ../containers-common.yaml @@ -447,6 +452,7 @@ outputs: nova::compute::libvirt::log_filters: {get_param: LibvirtLogFilters} nova::compute::libvirt::virtlogd::log_filters: {get_param: LibvirtVirtlogdLogFilters} rbd_persistent_storage: {get_param: CinderEnableRbdBackend} + rbd_disk_cachemodes: {get_param: RbdDiskCachemodes} - if: - use_tls_for_live_migration - tripleo::profile::base::nova::migration::client::libvirt_tls: true diff --git a/releasenotes/notes/rbd-disk-cache-modes-284a73271741ea62.yaml b/releasenotes/notes/rbd-disk-cache-modes-284a73271741ea62.yaml new file mode 100644 index 0000000000..40e2beb794 --- /dev/null +++ b/releasenotes/notes/rbd-disk-cache-modes-284a73271741ea62.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + New parameter `RbdDiskCachemodes` allows to override + the disk cache modes for RBD. Defaults to ['network=writeback'].