Merge "Disable notification from services by default" into stable/train

openstack-archive · Jan 27, 2021 · 72c4d76 · 72c4d76
2 parents 4dab19f + 491b545
commit 72c4d76
Show file tree

Hide file tree

Showing 23 changed files with 32 additions and 15 deletions.
diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml
@@ -105,6 +105,7 @@ parameter_defaults:
     ceilometer::agent::polling::polling_interval: 15
     # NOTE(mmagr): uncomment when QDR mesh will actually work (followup on review.opendev.org/702754)
     #tripleo::profile::base::metrics::qdr::router_mode: interior
+  NotificationDriver: 'messagingv2'
   ManagePolling: true
   ManagePipeline: true
   CeilometerEnableGnocchi: true

diff --git a/ci/environments/scenario001-standalone.yaml b/ci/environments/scenario001-standalone.yaml
@@ -43,9 +43,9 @@ parameter_defaults:
     # in sync with the archive policy, 60s too.
     ceilometer::agent::polling::polling_interval: 15
     tripleo::profile::base::metrics::qdr::interior_mesh_nodes: ''
+  NotificationDriver: 'messagingv2'
   ManagePolling: true
   HeatConfigureDelegatedRoles: true
-  ManagePipeline: true
   CeilometerEnableGnocchi: true
   PipelinePublishers:
     - gnocchi://?archive_policy=ceilometer-high-rate

diff --git a/ci/environments/scenario002-standalone.yaml b/ci/environments/scenario002-standalone.yaml
@@ -33,6 +33,7 @@ parameter_defaults:
     # instead of 10 minutes. Note that tempest telemetry.alarm_granularity must
     # in sync with the archive policy, 60s too.
     ceilometer::agent::polling::polling_interval: 15
+  NotificationDriver: 'messagingv2'
   ManagePolling: true
   ManagePipeline: true
   CeilometerEnableGnocchi: true

diff --git a/deployment/aodh/aodh-base.yaml b/deployment/aodh/aodh-base.yaml
@@ -54,7 +54,7 @@ parameters:
     description: Keystone region for endpoint
   NotificationDriver:
     type: string
-    default: 'messagingv2'
+    default: 'noop'
     description: Driver or drivers to handle sending notifications.
 
 conditions:

diff --git a/deployment/barbican/barbican-api-container-puppet.yaml b/deployment/barbican/barbican-api-container-puppet.yaml
@@ -156,7 +156,7 @@ parameters:
     type: json
   NotificationDriver:
     type: string
-    default: 'messagingv2'
+    default: 'noop'
     description: Driver or drivers to handle sending notifications.
   DeployIdentifier:
     default: ''

diff --git a/deployment/ceilometer/ceilometer-base-container-puppet.yaml b/deployment/ceilometer/ceilometer-base-container-puppet.yaml
@@ -74,7 +74,7 @@ parameters:
     hidden: true
   NotificationDriver:
     type: string
-    default: 'messagingv2'
+    default: 'noop'
     description: Driver or drivers to handle sending notifications.
   GnocchiArchivePolicy:
     default: 'ceilometer-low-rate'

diff --git a/deployment/cinder/cinder-api-container-puppet.yaml b/deployment/cinder/cinder-api-container-puppet.yaml
@@ -86,7 +86,7 @@ parameters:
     type: json
   NotificationDriver:
     type: string
-    default: 'messagingv2'
+    default: 'noop'
     description: Driver or drivers to handle sending notifications.
   RootStackName:
     description: The name of the stack/plan.

diff --git a/deployment/experimental/designate/designate-base.yaml b/deployment/experimental/designate/designate-base.yaml
@@ -64,7 +64,7 @@ parameters:
     type: number
   NotificationDriver:
     type: string
-    default: 'messagingv2'
+    default: 'noop'
     description: Driver or drivers to handle sending notifications.
 
 parameter_groups:

diff --git a/deployment/glance/glance-api-container-puppet.yaml b/deployment/glance/glance-api-container-puppet.yaml
@@ -194,7 +194,7 @@ parameters:
     type: json
   NotificationDriver:
     type: string
-    default: 'messagingv2'
+    default: 'noop'
     description: Driver or drivers to handle sending notifications.
   EnableInternalTLS:
     type: boolean

diff --git a/deployment/heat/heat-base-puppet.yaml b/deployment/heat/heat-base-puppet.yaml
@@ -121,7 +121,7 @@ parameters:
     type: number
   NotificationDriver:
     type: string
-    default: 'messagingv2'
+    default: 'noop'
     description: Driver or drivers to handle sending notifications.
   HeatCorsAllowedOrigin:
     type: string

diff --git a/deployment/keystone/keystone-container-puppet.yaml b/deployment/keystone/keystone-container-puppet.yaml
@@ -176,7 +176,7 @@ parameters:
     hidden: true
   NotificationDriver:
     type: string
-    default: 'messagingv2'
+    default: 'noop'
     description: Driver or drivers to handle sending notifications.
   KeystoneChangePasswordUponFirstUse:
     type: string

diff --git a/deployment/manila/manila-base.yaml b/deployment/manila/manila-base.yaml
@@ -50,7 +50,7 @@ parameters:
     hidden: true
   NotificationDriver:
     type: string
-    default: 'messagingv2'
+    default: 'noop'
     description: Driver or drivers to handle sending notifications.
 
 conditions:

diff --git a/deployment/mistral/mistral-base.yaml b/deployment/mistral/mistral-base.yaml
@@ -47,7 +47,7 @@ parameters:
     hidden: true
   NotificationDriver:
     type: string
-    default: 'messagingv2'
+    default: 'noop'
     description: Driver or drivers to handle sending notifications.
 
 conditions:

diff --git a/deployment/neutron/neutron-base.yaml b/deployment/neutron/neutron-base.yaml
@@ -103,7 +103,7 @@ parameters:
     type: json
   NotificationDriver:
     type: string
-    default: 'messagingv2'
+    default: 'noop'
     description: Driver or drivers to handle sending notifications.
   EnableVLANTransparency:
     default: false

diff --git a/deployment/nova/nova-base-puppet.yaml b/deployment/nova/nova-base-puppet.yaml
@@ -36,7 +36,7 @@ parameters:
     description: Keystone region for endpoint
   NotificationDriver:
     type: string
-    default: 'messagingv2'
+    default: 'noop'
     description: Driver or drivers to handle sending notifications.
   NovaPassword:
     description: The password for the nova service and db account

diff --git a/deployment/octavia/octavia-base.yaml b/deployment/octavia/octavia-base.yaml
@@ -48,7 +48,7 @@ parameters:
         configuration remnants after upgrades.
   NotificationDriver:
     type: string
-    default: 'messagingv2'
+    default: 'noop'
     description: Driver or drivers to handle sending notifications.
   OctaviaUserName:
     description: The username for the Octavia database and keystone accounts.

diff --git a/deployment/sahara/sahara-base.yaml b/deployment/sahara/sahara-base.yaml
@@ -50,7 +50,7 @@ parameters:
     type: comma_delimited_list
   NotificationDriver:
     type: string
-    default: 'messagingv2'
+    default: 'noop'
     description: Driver or drivers to handle sending notifications.
   NtpServer:
     default: ['0.pool.ntp.org', '1.pool.ntp.org', '2.pool.ntp.org', '3.pool.ntp.org']

diff --git a/environments/enable-legacy-telemetry.yaml b/environments/enable-legacy-telemetry.yaml
@@ -17,6 +17,7 @@ resource_registry:
   OS::TripleO::Services::Logging::PankoApi: ../deployment/logging/files/panko-api.yaml
 
 parameter_defaults:
+  NotificationDriver: 'messagingv2'
   # uncomment the next two lines when using ceph
   # GnocchiRbdPoolName: 'metrics'
   # GnocchiBackend: 'rbd'

diff --git a/environments/enable-stf.yaml b/environments/enable-stf.yaml
@@ -8,6 +8,7 @@ resource_registry:
   OS::TripleO::Services::ComputeCeilometerAgent: ../deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml
 
 parameter_defaults:
+  NotificationDriver: 'messagingv2'
   CeilometerQdrPublishEvents: true
   CeilometerQdrPublishMetrics: true
   EnableSTF: true

diff --git a/environments/metrics/ceilometer-write-qdr.yaml b/environments/metrics/ceilometer-write-qdr.yaml
@@ -12,3 +12,4 @@ parameter_defaults:
   CeilometerEnablePanko: false
   CeilometerQdrPublishEvents: true
   CeilometerQdrPublisMetrics: true
+  NotificationDriver: 'messagingv2'
diff --git a/environments/services-baremetal/undercloud-ceilometer.yaml b/environments/services-baremetal/undercloud-ceilometer.yaml
@@ -3,3 +3,6 @@ resource_registry:
   OS::TripleO::Services::UndercloudCeilometerAgentCentral: ../../deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
   OS::TripleO::Services::UndercloudCeilometerAgentNotification: ../../deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
   OS::TripleO::Services::UndercloudCeilometerAgentIpmi: ../../deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml
+
+parameter_defaults:
+  NotificationDriver: 'messagingv2'
diff --git a/environments/services/undercloud-ceilometer.yaml b/environments/services/undercloud-ceilometer.yaml
@@ -4,3 +4,6 @@ resource_registry:
   OS::TripleO::Services::CeilometerAgentCentral: ../../deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
   OS::TripleO::Services::CeilometerAgentNotification: ../../deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
   OS::TripleO::Services::CeilometerAgentIpmi: ../../deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml
+
+parameter_defaults:
+  NotificationDriver: 'messagingv2'
diff --git a/releasenotes/notes/disable-notification-driver-a888d4e9b8eed1dc.yaml b/releasenotes/notes/disable-notification-driver-a888d4e9b8eed1dc.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    Now NotificationDriver is set to noop by default, as legacy telemetry
+    services are disabled by default. Explicitly set NotificationDriver
+    parameter to notifications from each services.