From abf34de6c866493bdf282288e6585f7d42da455a Mon Sep 17 00:00:00 2001
From: Rajesh Tailor <ratailor@redhat.com>
Date: Thu, 6 Jun 2019 12:20:23 +0530
Subject: [PATCH] Add new role parameter NovaLibvirtMemStatsPeriodSeconds

Add role parameter NovaLibvirtMemStatsPeriodSeconds which allows to
set `libvirt/mem_stats_period_seconds` parameter value to
number of seconds to memory usage statistics period, where
zero or negative value mean to disable memory usage statistics.

Default value for the parameter is 10.
Also set the default value to 0 for Real-Time Compute roles.

Depends-On: https://review.opendev.org/#/c/671232/
Change-Id: I8e1a81bc69b4d266755ba3c2a4bf17f37d276fd7
(cherry picked from commit 66c4e23654c6092f5a1afe73ef4f806e24f9da18)
---
 deployment/nova/nova-compute-container-puppet.yaml     | 10 ++++++++++
 ...virt_mem_stats_period_seconds-b9b606232629cb38.yaml |  8 ++++++++
 roles/ComputeOvsDpdkRT.yaml                            |  1 +
 roles/ComputeOvsDpdkSriovRT.yaml                       |  1 +
 roles/ComputeRealTime.yaml                             |  1 +
 roles/ComputeSriovRT.yaml                              |  1 +
 6 files changed, 22 insertions(+)
 create mode 100644 releasenotes/notes/nova_libvirt_mem_stats_period_seconds-b9b606232629cb38.yaml

diff --git a/deployment/nova/nova-compute-container-puppet.yaml b/deployment/nova/nova-compute-container-puppet.yaml
index 6d90d9b90b..817b716d5f 100644
--- a/deployment/nova/nova-compute-container-puppet.yaml
+++ b/deployment/nova/nova-compute-container-puppet.yaml
@@ -292,6 +292,14 @@ parameters:
     type: number
     tags:
       - role_specific
+  NovaLibvirtMemStatsPeriodSeconds:
+    description: >
+      A number of seconds to memory usage statistics period, zero or negative
+      value mean to disable memory usage statistics.
+    default: 10
+    type: number
+    tags:
+      - role_specific
   NeutronMechanismDrivers:
     default: 'ovn'
     description: |
@@ -364,6 +372,7 @@ resources:
               nfs_options: NovaNfsOptions
               nfs_vers: NovaNfsVersion
               nova::compute::libvirt::num_pcie_ports: NovaLibvirtNumPciePorts
+              nova::compute::libvirt::mem_stats_period_seconds: NovaLibvirtMemStatsPeriodSeconds
             - values: {get_param: [RoleParameters]}
           - values:
               NovaVcpuPinSet: {get_param: NovaVcpuPinSet}
@@ -384,6 +393,7 @@ resources:
               NovaNfsOptions: {get_param: NovaNfsOptions}
               NovaNfsVersion: {get_param: NovaNfsVersion}
               NovaLibvirtNumPciePorts: {get_param: NovaLibvirtNumPciePorts}
+              NovaLibvirtMemStatsPeriodSeconds: {get_param: NovaLibvirtMemStatsPeriodSeconds}
 
 conditions:
   enable_instance_ha: {equals: [{get_param: EnableInstanceHA}, true]}
diff --git a/releasenotes/notes/nova_libvirt_mem_stats_period_seconds-b9b606232629cb38.yaml b/releasenotes/notes/nova_libvirt_mem_stats_period_seconds-b9b606232629cb38.yaml
new file mode 100644
index 0000000000..90c4f0f164
--- /dev/null
+++ b/releasenotes/notes/nova_libvirt_mem_stats_period_seconds-b9b606232629cb38.yaml
@@ -0,0 +1,8 @@
+---
+features:
+  - |
+    Add parameter NovaLibvirtMemStatsPeriodSeconds, which allows to
+    set `libvirt/mem_stats_period_seconds` parameter value to number
+    of seconds to memory usage statistics period, zero or negative
+    value mean to disable memory usage statistics.
+    Default value for NovaLibvirtMemStatsPeriodSeconds is 10.
diff --git a/roles/ComputeOvsDpdkRT.yaml b/roles/ComputeOvsDpdkRT.yaml
index 7ae703e43d..8becbf45c6 100644
--- a/roles/ComputeOvsDpdkRT.yaml
+++ b/roles/ComputeOvsDpdkRT.yaml
@@ -18,6 +18,7 @@
     TunedProfileName: "realtime-virtual-host"
     NovaLibvirtRxQueueSize: 1024
     NovaLibvirtTxQueueSize: 1024
+    NovaLibvirtMemStatsPeriodSeconds: 0
   update_serial: 25
   ServicesDefault:
     - OS::TripleO::Services::Aide
diff --git a/roles/ComputeOvsDpdkSriovRT.yaml b/roles/ComputeOvsDpdkSriovRT.yaml
index e865eaaacc..d72fa81590 100644
--- a/roles/ComputeOvsDpdkSriovRT.yaml
+++ b/roles/ComputeOvsDpdkSriovRT.yaml
@@ -15,6 +15,7 @@
     TunedProfileName: "realtime-virtual-host"
     NovaLibvirtRxQueueSize: 1024
     NovaLibvirtTxQueueSize: 1024
+    NovaLibvirtMemStatsPeriodSeconds: 0
   update_serial: 25
   ServicesDefault:
     - OS::TripleO::Services::Aide
diff --git a/roles/ComputeRealTime.yaml b/roles/ComputeRealTime.yaml
index 78ff0e9420..0931990c3e 100644
--- a/roles/ComputeRealTime.yaml
+++ b/roles/ComputeRealTime.yaml
@@ -22,6 +22,7 @@
     KernelArgs: ""      # these must be set in an environment file or similar
     IsolCpusList: ""    # according to the hardware of real-time nodes
     NovaVcpuPinSet: ""  #
+    NovaLibvirtMemStatsPeriodSeconds: 0
   update_serial: 25
   ServicesDefault:
     - OS::TripleO::Services::Aide
diff --git a/roles/ComputeSriovRT.yaml b/roles/ComputeSriovRT.yaml
index f22ceeb8a4..7cc773b870 100644
--- a/roles/ComputeSriovRT.yaml
+++ b/roles/ComputeSriovRT.yaml
@@ -15,6 +15,7 @@
   ImageDefault: overcloud-realtime-compute
   RoleParametersDefault:
     TunedProfileName: "realtime-virtual-host"
+    NovaLibvirtMemStatsPeriodSeconds: 0
   update_serial: 25
   ServicesDefault:
     - OS::TripleO::Services::Aide