From aaeb6b05ffd37aeca0827a4044ad258cccf40719 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.

Conflicts:
      roles/ComputeOvsDpdkRT.yaml
      roles/ComputeOvsDpdkSriovRT.yaml

Resolved conflict related to ordering of parameters in
RoleParametersDefault section.

Depends-On: https://review.opendev.org/#/c/671399/
Change-Id: I8e1a81bc69b4d266755ba3c2a4bf17f37d276fd7
(cherry picked from commit 66c4e23654c6092f5a1afe73ef4f806e24f9da18)
(cherry picked from commit abf34de6c866493bdf282288e6585f7d42da455a)
(cherry picked from commit 85a3685bb2ccc558a95081c3ba7017a4277732ff)
---
 puppet/services/nova-compute.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/puppet/services/nova-compute.yaml b/puppet/services/nova-compute.yaml
index d18dfd10b1..c1fe542188 100644
--- a/puppet/services/nova-compute.yaml
+++ b/puppet/services/nova-compute.yaml
@@ -195,6 +195,14 @@ parameters:
     type: string
     default: 'regionOne'
     description: Keystone region for endpoint
+  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
 
 conditions:
   enable_live_migration_tunnelled:
@@ -236,6 +244,7 @@ resources:
               nfs_share: NovaNfsShare
               nfs_options: NovaNfsOptions
               nfs_vers: NovaNfsVersion
+              nova::compute::libvirt::mem_stats_period_seconds: NovaLibvirtMemStatsPeriodSeconds
             - values: {get_param: [RoleParameters]}
           - values:
               NovaVcpuPinSet: {get_param: NovaVcpuPinSet}
@@ -248,6 +257,7 @@ resources:
               NovaNfsShare: {get_param: NovaNfsShare}
               NovaNfsOptions: {get_param: NovaNfsOptions}
               NovaNfsVersion: {get_param: NovaNfsVersion}
+              NovaLibvirtMemStatsPeriodSeconds: {get_param: NovaLibvirtMemStatsPeriodSeconds}
 
 outputs:
   role_data:
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 a4a9ba5a53..31fdda2ff8 100644
--- a/roles/ComputeOvsDpdkRT.yaml
+++ b/roles/ComputeOvsDpdkRT.yaml
@@ -16,6 +16,7 @@
     TunedProfileName: "realtime-virtual-host"
     NovaLibvirtRxQueueSize: 1024
     NovaLibvirtTxQueueSize: 1024
+    NovaLibvirtMemStatsPeriodSeconds: 0
   disable_upgrade_deployment: True
   update_serial: 25
   ServicesDefault:
diff --git a/roles/ComputeOvsDpdkSriovRT.yaml b/roles/ComputeOvsDpdkSriovRT.yaml
index 79dd1e8a42..8f953b200e 100644
--- a/roles/ComputeOvsDpdkSriovRT.yaml
+++ b/roles/ComputeOvsDpdkSriovRT.yaml
@@ -15,6 +15,7 @@
     TunedProfileName: "realtime-virtual-host"
     NovaLibvirtRxQueueSize: 1024
     NovaLibvirtTxQueueSize: 1024
+    NovaLibvirtMemStatsPeriodSeconds: 0
   disable_upgrade_deployment: True
   update_serial: 25
   ServicesDefault:
diff --git a/roles/ComputeRealTime.yaml b/roles/ComputeRealTime.yaml
index 9e3cfd74a4..d82586f79b 100644
--- a/roles/ComputeRealTime.yaml
+++ b/roles/ComputeRealTime.yaml
@@ -20,6 +20,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 0d55c77239..53408ed964 100644
--- a/roles/ComputeSriovRT.yaml
+++ b/roles/ComputeSriovRT.yaml
@@ -14,6 +14,7 @@
   ImageDefault: overcloud-realtime-compute
   RoleParametersDefault:
     TunedProfileName: "realtime-virtual-host"
+    NovaLibvirtMemStatsPeriodSeconds: 0
   update_serial: 25
   ServicesDefault:
     - OS::TripleO::Services::Aide