Merge "Nova: Disable instance usage audit by default"

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

@@ -812,6 +812,12 @@ parameters:
     description: If set to true and if EnableInternalTLS is enabled, it will
                  set the libvirt URI's transport to tls and configure the
                  relevant keys for libvirt.
+  NovaInstanceUsageAudit:
+    type: boolean
+    default: false
+    description: >
+      Enable periodic compute.instance.exists notifications, which are consumed
+      by Telemetry service.
 
   # DEPRECATED: the following options are deprecated and are currently maintained
   # for backwards compatibility. They will be removed in future release.
@@ -1150,8 +1156,6 @@ outputs:
             nova::cinder::region_name: {get_param: KeystoneRegion}
             nova::compute::rbd::libvirt_rbd_secret_key: {get_param: CephClientKey}
             nova::compute::rbd::libvirt_rbd_secret_uuid: {get_param: CephClusterFSID}
-            nova::compute::instance_usage_audit: true
-            nova::compute::instance_usage_audit_period: 'hour'
             nova::compute::consecutive_build_service_disable_threshold: {get_param: NovaAutoDisabling}
             nova::compute::live_migration_wait_for_vif_plug: {get_param: NovaLiveMigrationWaitForVIFPlug}
             nova::migration::libvirt::live_migration_permit_post_copy:
@@ -1195,6 +1199,10 @@ outputs:
                 - {get_attr: [RoleParametersValue, value, nova_libvirt_max_queues]}
             # Params to enable service check on FFU
             nova::workarounds::disable_compute_service_check_for_ffu: {get_param: NovaDisableComputeServiceCheckForFfu}
+          - if:
+            - {get_param: NovaInstanceUsageAudit}
+            - nova::compute::instance_usage_audit: true
+              nova::compute::instance_usage_audit_period: 'hour'
           - if:
             - glance_enable_rbd_download_set
             - nova::glance::enable_rbd_download: {get_attr: [RoleParametersValue, value, nova_glance_enable_rbd_download]}

environments/enable-legacy-telemetry.yaml

@@ -16,6 +16,7 @@ resource_registry:
 
 parameter_defaults:
   NotificationDriver: 'messagingv2'
+  NovaInstanceUsageAudit: true
   # uncomment the next two lines when using ceph
   # GnocchiRbdPoolName: 'metrics'
   # GnocchiBackend: 'rbd'

environments/metrics/ceilometer-write-qdr.yaml

@@ -12,3 +12,4 @@ parameter_defaults:
   CeilometerQdrPublishEvents: true
   CeilometerQdrPublishMetrics: true
   NotificationDriver: 'messagingv2'
+  NovaInstanceUsageAudit: true

releasenotes/notes/nova-instance_usage_audit-dfb17d89446352ae.yaml

@@ -0,0 +1,10 @@
+---
+features:
+  - |
+    The new ``NovaInstanceUsageAudit`` parameter has been added.
+
+fixes:
+  - |
+    The periodic notifications of instance usage by Nova is now disabled by
+    default. These notifications are not consumed unless Telemtry services are
+    enabled.