Merge "Add param for RBD disk cache modes" into stable/wallaby

deployment/nova/nova-compute-container-puppet.yaml

@@ -791,6 +791,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: |
@@ -1102,6 +1108,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'

deployment/nova/nova-libvirt-container-puppet.yaml

@@ -281,6 +281,11 @@ parameters:
     default: "/var/lib/tripleo-config/ceph"
     description: |
       The path where the Ceph Cluster config files are stored on the host.
+  RbdDiskCachemodes:
+    type: comma_delimited_list
+    default: ['network=writeback']
+    description: >
+      Disk cachemodes for RBD backend.
 
 conditions:
 
@@ -449,6 +454,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

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'].